diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-17 22:22:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:43:41 -0500 |
| commit | 545f97f94e443fa7b05fe9be95efcecec89346c5 (patch) | |
| tree | 43a4c0e3f6d36e5475306034edcd40ccc0832925 /source4 | |
| parent | bd46898e69ff9431eb164f4d5fa3caec99e2bb4a (diff) | |
| download | samba-545f97f94e443fa7b05fe9be95efcecec89346c5.tar.gz samba-545f97f94e443fa7b05fe9be95efcecec89346c5.tar.bz2 samba-545f97f94e443fa7b05fe9be95efcecec89346c5.zip | |
r20865: remove useless warning, we now always pass the current partition
control as non critical control
metze
(This used to be commit 21fddb643bf05ca2b7c60a4695e1fff0f29ec6d1)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_tdb.c | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index 6adf6f48ca..16ab5b905b 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -299,11 +299,8 @@ static int ltdb_add(struct ldb_module *module, struct ldb_request *req) struct ltdb_context *ltdb_ac; int tret, ret = LDB_SUCCESS; - if (req->controls != NULL) { - ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n"); - if (check_critical_controls(req->controls)) { - return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; - } + if (check_critical_controls(req->controls)) { + return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; } req->handle = init_ltdb_handle(ltdb, module, req); @@ -410,11 +407,8 @@ static int ltdb_delete(struct ldb_module *module, struct ldb_request *req) struct ltdb_context *ltdb_ac; int tret, ret = LDB_SUCCESS; - if (req->controls != NULL) { - ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n"); - if (check_critical_controls(req->controls)) { - return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; - } + if (check_critical_controls(req->controls)) { + return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; } req->handle = NULL; @@ -769,11 +763,8 @@ static int ltdb_modify(struct ldb_module *module, struct ldb_request *req) struct ltdb_context *ltdb_ac; int tret, ret = LDB_SUCCESS; - if (req->controls != NULL) { - ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n"); - if (check_critical_controls(req->controls)) { - return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; - } + if (check_critical_controls(req->controls)) { + return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; } req->handle = NULL; @@ -819,11 +810,8 @@ static int ltdb_rename(struct ldb_module *module, struct ldb_request *req) struct ldb_message *msg; int tret, ret = LDB_SUCCESS; - if (req->controls != NULL) { - ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n"); - if (check_critical_controls(req->controls)) { - return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; - } + if (check_critical_controls(req->controls)) { + return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; } req->handle = NULL; @@ -924,11 +912,8 @@ static int ltdb_wait(struct ldb_handle *handle, enum ldb_wait_type type) static int ltdb_request(struct ldb_module *module, struct ldb_request *req) { /* check for oustanding critical controls and return an error if found */ - if (req->controls != NULL) { - ldb_debug(module->ldb, LDB_DEBUG_WARNING, "Controls should not reach the ldb_tdb backend!\n"); - if (check_critical_controls(req->controls)) { - return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; - } + if (check_critical_controls(req->controls)) { + return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION; } /* search, add, modify, delete, rename are handled by their own, no other op supported */ |