[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1357-g9a1466a

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  9a1466abbd4115f4a57d794006aca29aa0184ced (commit)
       via  bc607c334ff86624b891886a6f874da2bcff113e (commit)
       via  3903ef9168a18d34517c78536d34e147a9bc01cd (commit)
       via  7503f93f2f07f81ada1b5d9ec8fdd3d5509376ae (commit)
      from  8d44f997c88b97fc40a88eebd50b6df720c0c10f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 9a1466abbd4115f4a57d794006aca29aa0184ced
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 25 16:36:13 2008 +1100

    Remove pointless cast

commit bc607c334ff86624b891886a6f874da2bcff113e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 25 15:25:13 2008 +1100

    Remove useless extra argument to samdb_result_account_expires().
    
    Andrew Bartlett

commit 3903ef9168a18d34517c78536d34e147a9bc01cd
Merge: 7503f93f2f07f81ada1b5d9ec8fdd3d5509376ae 8d44f997c88b97fc40a88eebd50b6df720c0c10f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Mar 25 10:29:35 2008 +1100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

commit 7503f93f2f07f81ada1b5d9ec8fdd3d5509376ae
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Mar 20 15:14:49 2008 +1100

    Explain why this attribute should be skipped.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source/auth/sam.c                    |    4 ++--
 source/dsdb/common/util.c            |    7 +++----
 source/kdc/hdb-ldb.c                 |    2 +-
 source/setup/schema-map-openldap-2.3 |    1 +
 4 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/sam.c b/source/auth/sam.c
index 8821963..b171fc5 100644
--- 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 807c028..1220a5c 100644
--- a/source/dsdb/common/util.c
+++ b/source/dsdb/common/util.c
@@ -445,13 +445,12 @@ 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)
+	if (ret == 0)
 		ret = 0x7FFFFFFFFFFFFFFFULL;
 
 	return ret;
diff --git a/source/kdc/hdb-ldb.c b/source/kdc/hdb-ldb.c
index bc5a45a..d983b77 100644
--- 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 {
diff --git a/source/setup/schema-map-openldap-2.3 b/source/setup/schema-map-openldap-2.3
index 0bce95a..3f07a9d 100644
--- a/source/setup/schema-map-openldap-2.3
+++ b/source/setup/schema-map-openldap-2.3
@@ -11,6 +11,7 @@ distinguishedName
 description
 cn
 top
+#The memberOf plugin provides this attribute
 memberOf
 #This shouldn't make it to the ldap server
 sambaPassword


-- 
Samba Shared Repository