svn commit: samba r17700 - in branches/SAMBA_4_0/source/lib/ldb/modules: .

abartlet at samba.org abartlet at samba.org
Tue Aug 22 06:18:08 GMT 2006


Author: abartlet
Date: 2006-08-22 06:18:07 +0000 (Tue, 22 Aug 2006)
New Revision: 17700

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17700

Log:
Despite our best hopes, the way module initialisation tends to happen,
we make searches before things are initialised.  Cope with this.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c	2006-08-22 06:07:01 UTC (rev 17699)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c	2006-08-22 06:18:07 UTC (rev 17700)
@@ -238,10 +238,10 @@
 	private_data = talloc_get_type(module->private_data, struct private_data);
 
 	/* check if paging is supported and if there is a any control */
-	if (!private_data->paged_supported || req->controls) {
-		/* do not touch this request
-		 * oaged controls not supported or
-		 * explicit controls have been set */
+	if (!private_data || !private_data->paged_supported || req->controls) {
+		/* do not touch this request paged controls not
+		 * supported or explicit controls have been set or we
+		 * are just not setup yet */
 		return ldb_next_request(module, req);
 	}
 



More information about the samba-cvs mailing list