svn commit: samba r20865 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .

[metze at samba.org]

Author: metze
Date: 2007-01-17 22:22:29 +0000 (Wed, 17 Jan 2007)
New Revision: 20865

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

Log:
remove useless warning, we now always pass the current partition
control as non critical control

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c	2007-01-17 22:21:25 UTC (rev 20864)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c	2007-01-17 22:22:29 UTC (rev 20865)
@@ -299,11 +299,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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_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 */