summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-10-22 21:15:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:33 -0500
commit52030310076002bfa94fd3332f28f38b5a185890 (patch)
tree7314a0d2b9e027467a2372e9809d2cb0173b7c1e /source4
parent68453d1da2ad68c1e9cb5d42eb71822ae6f0117b (diff)
downloadsamba-52030310076002bfa94fd3332f28f38b5a185890.tar.gz
samba-52030310076002bfa94fd3332f28f38b5a185890.tar.bz2
samba-52030310076002bfa94fd3332f28f38b5a185890.zip
r19452: Warn but don't die if registering against the rootdse is not possible
(This used to be commit 4ad2eba2aa7711d480a844766e2dd3da938b3413)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/modules/asq.c3
-rw-r--r--source4/lib/ldb/modules/paged_results.c4
-rw-r--r--source4/lib/ldb/modules/sort.c4
3 files changed, 3 insertions, 8 deletions
diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index 354bbf2bc8..2fed6aac50 100644
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -454,8 +454,7 @@ static int asq_init(struct ldb_module *module)
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);
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 3ab575ef6b..c4b1ecf26b 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -544,9 +544,7 @@ static int paged_request_init(struct ldb_module *module)
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);
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index 3a0598c528..4fa03f8bfa 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -423,9 +423,7 @@ static int server_sort_init(struct ldb_module *module)
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);