summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kroeger <andrew@sprocks.gotdns.com>2008-03-06 06:07:28 -0600
committerAndrew Kroeger <andrew@sprocks.gotdns.com>2008-03-07 05:59:56 -0600
commit20c701400961901e92315b4cd02038fff086e33d (patch)
tree3ae354ed1ab9ad0e6c281aec5e5d68a201991a7f
parent01b3d89aeccdd7bd6bc2a9636e59f0c928cc22dc (diff)
downloadsamba-20c701400961901e92315b4cd02038fff086e33d.tar.gz
samba-20c701400961901e92315b4cd02038fff086e33d.tar.bz2
samba-20c701400961901e92315b4cd02038fff086e33d.zip
Update account expiration to use new samdb_result_account_expires() function.
(This used to be commit 2b6b4e5a1611744eea5dd9ec17c416916d7edab4)
-rw-r--r--source4/auth/sam.c4
-rw-r--r--source4/kdc/hdb-ldb.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index 9a8045f62d..882196343c 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -157,7 +157,7 @@ _PUBLIC_ NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
acct_flags = samdb_result_acct_flags(sam_ctx, mem_ctx, msg, domain_dn);
- acct_expiry = samdb_result_nttime(msg, "accountExpires", 0);
+ acct_expiry = samdb_result_account_expires(msg, 0);
/* Check for when we must change this password, taking the
* userAccountControl flags into account */
@@ -351,7 +351,7 @@ _PUBLIC_ NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_conte
server_info->last_logon = samdb_result_nttime(msg, "lastLogon", 0);
server_info->last_logoff = samdb_result_nttime(msg, "lastLogoff", 0);
- server_info->acct_expiry = samdb_result_nttime(msg, "accountExpires", 0);
+ server_info->acct_expiry = samdb_result_account_expires(msg, 0);
server_info->last_password_change = samdb_result_nttime(msg, "pwdLastSet", 0);
ncname = samdb_result_dn(sam_ctx, mem_ctx, msg_domain_ref, "nCName", NULL);
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index 9a17e581e3..bc5a45ae2b 100644
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -510,9 +510,8 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
entry_ex->entry.valid_start = NULL;
- acct_expiry = samdb_result_nttime(msg, "accountExpires", (NTTIME)-1);
- if ((acct_expiry == (NTTIME)-1) ||
- (acct_expiry == 0x7FFFFFFFFFFFFFFFULL)) {
+ acct_expiry = samdb_result_account_expires(msg, 0);
+ if (acct_expiry == 0x7FFFFFFFFFFFFFFFULL) {
entry_ex->entry.valid_end = NULL;
} else {
entry_ex->entry.valid_end = malloc(sizeof(*entry_ex->entry.valid_end));