[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Thu Aug 9 03:40:02 MDT 2012


The branch, master has been updated
       via  d799b25 s4-dsdb: Remove strcasecmp() fallback in replmd_ldb_message_element_attid_sort
       via  8dd09ef s4-dsdb: Do not reload partition metadata except on transaction start
      from  0d7b17f s3:smb2_sesssetup: setup global->[en|de]cryption_key

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d799b25dd3ed0f72ee03949225ba241c5538d7d6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Aug 9 16:16:03 2012 +1000

    s4-dsdb: Remove strcasecmp() fallback in replmd_ldb_message_element_attid_sort
    
    In all callers, we must already have a attributeID for each of the
    values or else we would have already given an error, or could not have
    obtained the message over DRS.
    
    Andrew Bartlett
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Aug  9 11:39:54 CEST 2012 on sn-devel-104

commit 8dd09ef46dee1056e1ea029375a250b12dacae10
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Aug 9 15:16:37 2012 +1000

    s4-dsdb: Do not reload partition metadata except on transaction start
    
    This ensures that we do not add objects that should go into a partition, but we
    simply return that an object is not present if the connection was created
    before the partition was loaded.  It is rare to create a new partition.
    
    Andrew Bartlett

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/partition.c      |   11 -----------
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |    7 -------
 2 files changed, 0 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 4a9216b..f980b67 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -549,12 +549,6 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
 	int ret;
 	bool domain_scope = false, phantom_root = false;
 
-	/* see if we are still up-to-date */
-	ret = partition_reload_if_required(module, data, req);
-	if (ret != LDB_SUCCESS) {
-		return ret;
-	}
-
 	p = find_partition(data, NULL, req);
 	if (p != NULL) {
 		/* the caller specified what partition they want the
@@ -1129,11 +1123,6 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
 		 * this reload for every query of the next global seq
 		 * number 
 		 */
-		ret = partition_reload_if_required(module, data, req);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-		
 		p = find_partition(data, NULL, req);
 		if (p != NULL) {
 			/* the caller specified what partition they want the
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 4bfbee1..6b5e121 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -661,13 +661,6 @@ static int replmd_ldb_message_element_attid_sort(const struct ldb_message_elemen
 	a1 = dsdb_attribute_by_lDAPDisplayName(schema, e1->name);
 	a2 = dsdb_attribute_by_lDAPDisplayName(schema, e2->name);
 
-	/*
-	 * TODO: remove this check, we should rely on e1 and e2 having valid attribute names
-	 *       in the schema
-	 */
-	if (!a1 || !a2) {
-		return strcasecmp(e1->name, e2->name);
-	}
 	if (a1->attributeID_id == a2->attributeID_id) {
 		return 0;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list