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

[idra at samba.org]

Author: idra
Date: 2006-10-22 21:15:30 +0000 (Sun, 22 Oct 2006)
New Revision: 19452

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

Log:

Warn but don't die if registering against the rootdse is not possible


Modified:
   branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
   branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c
   branches/SAMBA_4_0/source/lib/ldb/modules/sort.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/asq.c	2006-10-22 10:30:46 UTC (rev 19451)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/asq.c	2006-10-22 21:15:30 UTC (rev 19452)
@@ -454,8 +454,7 @@
 
 	ret = ldb_request(module->ldb, req);
 	if (ret != LDB_SUCCESS) {
-		ldb_debug(module->ldb, LDB_DEBUG_ERROR, "asq: Unable to register control with rootdse!\n");
-		return LDB_ERR_OTHER;
+		ldb_debug(module->ldb, LDB_DEBUG_WARNING, "asq: Unable to register control with rootdse!\n");
 	}
 
 	return ldb_next_init(module);

Modified: branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c	2006-10-22 10:30:46 UTC (rev 19451)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c	2006-10-22 21:15:30 UTC (rev 19452)
@@ -544,9 +544,7 @@
 
 	ret = ldb_request(module->ldb, req);
 	if (ret != LDB_SUCCESS) {
-		ldb_debug(module->ldb, LDB_DEBUG_ERROR, "paged_request: Unable to register control with rootdse!\n");
-		talloc_free(req);
-		return LDB_ERR_OTHER;
+		ldb_debug(module->ldb, LDB_DEBUG_WARNING, "paged_request: Unable to register control with rootdse!\n");
 	}
 
 	talloc_free(req);

Modified: branches/SAMBA_4_0/source/lib/ldb/modules/sort.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/sort.c	2006-10-22 10:30:46 UTC (rev 19451)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/sort.c	2006-10-22 21:15:30 UTC (rev 19452)
@@ -423,9 +423,7 @@
 
 	ret = ldb_request(module->ldb, req);
 	if (ret != LDB_SUCCESS) {
-		ldb_debug(module->ldb, LDB_DEBUG_ERROR, "server_sort: Unable to register control with rootdse!\n");
-		talloc_free(req);
-		return LDB_ERR_OTHER;
+		ldb_debug(module->ldb, LDB_DEBUG_WARNING, "server_sort: Unable to register control with rootdse!\n");
 	}
 
 	talloc_free(req);