Remove useless extra argument to samdb_result_account_expires().

Andrew Bartlett

diff --git a/source/auth/sam.c b/source/auth/sam.c
index 882196343c7cff3a4c6ccdca2cb160ac4b833460..b171fc57b9abfe42b464fe40d6f02128e8ede0a2 100644 (file)
--- a/source/auth/sam.c
+++ b/source/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_account_expires(msg, 0);
+       acct_expiry = samdb_result_account_expires(msg);
 
        /* 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_account_expires(msg, 0);
+       server_info->acct_expiry = samdb_result_account_expires(msg);
        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/source/dsdb/common/util.c b/source/dsdb/common/util.c
index 807c0289f72f59837b0a6dedb11efea8561c5b07..8a7a22a641e98dd429f7771ed336a362d6e4ccf4 100644 (file)
--- a/source/dsdb/common/util.c
+++ b/source/dsdb/common/util.c
@@ -445,11 +445,10 @@ NTTIME samdb_result_nttime(struct ldb_message *msg, const char *attr, NTTIME def
  * Consolidate that logic here to allow clearer logic for account expiry in
  * the rest of the code.
  */
-NTTIME samdb_result_account_expires(struct ldb_message *msg,
-                                   NTTIME default_value)
+NTTIME samdb_result_account_expires(struct ldb_message *msg)
 {
        NTTIME ret = ldb_msg_find_attr_as_uint64(msg, "accountExpires",
-                                                default_value);
+                                                0);
 
        if (ret == (NTTIME)0)
                ret = 0x7FFFFFFFFFFFFFFFULL;

diff --git a/source/kdc/hdb-ldb.c b/source/kdc/hdb-ldb.c
index bc5a45ae2bb2392fbe50bd65440279ec459947b0..d983b77b40dc01efaa1610b01457faa4ed9da994 100644 (file)
--- a/source/kdc/hdb-ldb.c
+++ b/source/kdc/hdb-ldb.c
@@ -510,7 +510,7 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
 
        entry_ex->entry.valid_start = NULL;
 
-       acct_expiry = samdb_result_account_expires(msg, 0);
+       acct_expiry = samdb_result_account_expires(msg);
        if (acct_expiry == 0x7FFFFFFFFFFFFFFFULL) {
                entry_ex->entry.valid_end = NULL;
        } else {