[1948] in Moira Commits
/svn/moira r4087 - trunk/moira/incremental/kerberos
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Nov 15 11:54:55 2012
Date: Thu, 15 Nov 2012 11:54:49 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201211151654.qAFGsnYk019998@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2012-11-15 11:54:49 -0500 (Thu, 15 Nov 2012)
New Revision: 4087
Modified:
trunk/moira/incremental/kerberos/kerberos.c
Log:
Only look at after state when deciding what to do.
Modified: trunk/moira/incremental/kerberos/kerberos.c
===================================================================
--- trunk/moira/incremental/kerberos/kerberos.c 2012-11-13 17:38:08 UTC (rev 4086)
+++ trunk/moira/incremental/kerberos/kerberos.c 2012-11-15 16:54:49 UTC (rev 4087)
@@ -80,10 +80,10 @@
check_krb();
/* Reactivating a principal */
- if ((bstate == 3) && ((astate == 1) || (astate == 6) || (astate == 9)))
+ if ((astate == 1) || (astate == 6) || (astate == 9))
activate = 1;
/* Deactivating a principal */
- else if ((astate == 3) && ((bstate == 1) || (bstate == 6) || (bstate == 9)))
+ else if (astate == 3)
activate = 0;
/* Can ignore other changes */
else
@@ -96,6 +96,9 @@
critical_alert(whoami, "incremental", "Couldn't %s Kerberos principal for user %s",
activate ? "enable" : "disable", after[U_NAME]);
}
+ else
+ com_err(whoami, 0, "Successfully %sd Kerberos principal for user %s",
+ activate ? "enable" : "disable", after[U_NAME]);
exit(0);
}
