[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-600-g37f130f

Andrew Bartlett abartlet at samba.org
Fri Mar 20 06:05:17 GMT 2009


The branch, master has been updated
       via  37f130fd89d02e77bf55cbd8da731d87bb4ab1e8 (commit)
       via  4a45b0da5743f76f77c812d03ee625af10fb2a54 (commit)
      from  f696bb81f8499443eee9815e7adf8dbb6810506a (commit)

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


- Log -----------------------------------------------------------------
commit 37f130fd89d02e77bf55cbd8da731d87bb4ab1e8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Mar 20 16:47:34 2009 +1100

    s4:fullschema Use server-side sort to make the output deterministic

commit 4a45b0da5743f76f77c812d03ee625af10fb2a54
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Mar 20 16:45:52 2009 +1100

    s4:ldb Allow paged_searches to be mixed with other controls
    
    I want to mix this with the server-side sort in particular.
    
    Andrew Bartlett

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

Summary of changes:
 source4/lib/ldb/modules/paged_searches.c |    6 +++---
 source4/scripting/bin/fullschema         |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index 70b880e..c5430eb 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -230,10 +230,10 @@ static int ps_search(struct ldb_module *module, struct ldb_request *req)
 	private_data = talloc_get_type(ldb_module_get_private(module), struct private_data);
 	ldb = ldb_module_get_ctx(module);
 
-	/* check if paging is supported and if there is a any control */
-	if (!private_data || !private_data->paged_supported || req->controls) {
+	/* check if paging is supported */
+	if (!private_data || !private_data->paged_supported) {
 		/* do not touch this request paged controls not
-		 * supported or explicit controls have been set or we
+		 * supported or we
 		 * are just not setup yet */
 		return ldb_next_request(module, req);
 	}
diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema
index d3bf398..41c45f3 100644
--- a/source4/scripting/bin/fullschema
+++ b/source4/scripting/bin/fullschema
@@ -157,7 +157,8 @@ rootDse = res[0]
 
 if opts.dump_attributes:
     res = ldb.search(expression="objectClass=attributeSchema", 
-                     base=rootDse["schemaNamingContext"][0], scope=SCOPE_SUBTREE,attrs=attrib_attrs)
+                     base=rootDse["schemaNamingContext"][0], scope=SCOPE_SUBTREE,attrs=attrib_attrs,
+                     controls=["server_sort:1:0:cn"])
     
     for msg in res:
         o = Objectclass(ldb, msg["ldapDisplayName"])
@@ -167,7 +168,8 @@ if opts.dump_attributes:
             
 if opts.dump_classes:
     res = ldb.search(expression="objectClass=classSchema", 
-                     base=rootDse["schemaNamingContext"][0], scope=SCOPE_SUBTREE,attrs=class_attrs)
+                     base=rootDse["schemaNamingContext"][0], scope=SCOPE_SUBTREE,attrs=class_attrs,
+                     controls=["server_sort:1:0:cn"])
 
     for msg in res:
         o = Objectclass(ldb, msg["ldapDisplayName"])


-- 
Samba Shared Repository


More information about the samba-cvs mailing list