svn commit: samba r11987 - in branches/SAMBA_4_0/source/kdc: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-12-01 04:50:28 +0000 (Thu, 01 Dec 2005)
New Revision: 11987

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11987

Log:
Clarify the accountExpires behaviour in the KDC.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/kdc/hdb-ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/hdb-ldb.c	2005-12-01 00:43:36 UTC (rev 11986)
+++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c	2005-12-01 04:50:28 UTC (rev 11987)
@@ -310,16 +310,17 @@
 
 	ent->valid_start = NULL;
 
-	acct_expiry = samdb_result_nttime(msg, "accountExpires", -1LL);
-	if (acct_expiry != -1LL && acct_expiry != 0x7FFFFFFFFFFFFFFFLL) {
+	acct_expiry = samdb_result_nttime(msg, "accountExpires", (NTTIME)-1);
+	if ((acct_expiry == (NTTIME)-1) ||
+	    (acct_expiry == 0x7FFFFFFFFFFFFFFFULL)) {
+		ent->valid_end = NULL;
+	} else {
 		ent->valid_end = malloc(sizeof(*ent->valid_end));
 		if (ent->valid_end == NULL) {
 			ret = ENOMEM;
 			goto out;
 		}
 		*ent->valid_end = nt_time_to_unix(acct_expiry);
-	} else {
-		ent->valid_end = NULL;
 	}
 
 	if ((ent_type != HDB_LDB_ENT_TYPE_KRBTGT) && (!(userAccountControl & UF_DONT_EXPIRE_PASSWD))) {