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

abartlet at samba.org abartlet at samba.org
Thu Nov 15 11:05:25 GMT 2007


Author: abartlet
Date: 2007-11-15 11:05:22 +0000 (Thu, 15 Nov 2007)
New Revision: 25965

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

Log:
Remove duplicate block - thanks metze!

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c	2007-11-15 11:01:14 UTC (rev 25964)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c	2007-11-15 11:05:22 UTC (rev 25965)
@@ -547,24 +547,6 @@
 				       ldb_dn_get_linearized(req->op.search.base));
 		ret = LDB_ERR_INVALID_DN_SYNTAX;
 
-	} else if (ldb_dn_is_null(req->op.search.base) == true) {
-
-		/* Check what we should do with a NULL dn */
-		switch (req->op.search.scope) {
-		case LDB_SCOPE_BASE:
-			ldb_asprintf_errstring(module->ldb, 
-					       "NULL Base DN invalid for a base search");
-			ret = LDB_ERR_INVALID_DN_SYNTAX;
-		case LDB_SCOPE_ONELEVEL:
-			ldb_asprintf_errstring(module->ldb, 
-					       "NULL Base DN invalid for a one-level search");
-			ret = LDB_ERR_INVALID_DN_SYNTAX;	
-		case LDB_SCOPE_SUBTREE:
-		default:
-			/* We accept subtree searches from a NULL base DN, ie over the whole DB */
-			ret = LDB_SUCCESS;
-		}
-
 	} else if (ltdb->check_base) {
 		/* This database has been marked as 'checkBaseOnSearch', so do a spot check of the base dn */
 		ret = ltdb_search_base(module, req->op.search.base);



More information about the samba-cvs mailing list