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

[abartlet at samba.org]

Author: abartlet
Date: 2007-11-15 11:01:14 +0000 (Thu, 15 Nov 2007)
New Revision: 25964

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

Log:
Fix comment and use talloc hirachy in ldb_tdb initialisation.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_cache.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_cache.c	2007-11-15 10:20:55 UTC (rev 25963)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_cache.c	2007-11-15 11:01:14 UTC (rev 25964)
@@ -307,7 +307,7 @@
 	options = talloc(ltdb->cache, struct ldb_message);
 	if (options == NULL) goto failed;
 
-	options_dn = ldb_dn_new(module, module->ldb, LTDB_OPTIONS);
+	options_dn = ldb_dn_new(options, module->ldb, LTDB_OPTIONS);
 	if (options_dn == NULL) goto failed;
 
 	r= ltdb_search_dn1(module, options_dn, options);
@@ -315,7 +315,7 @@
 		goto failed;
 	}
 	
-	/* possibly initialise the baseinfo */
+	/* set flag for checking base DN on searches */
 	if (r == LDB_SUCCESS) {
 		ltdb->check_base = ldb_msg_find_attr_as_bool(options, LTDB_CHECK_BASE, false);
 	} else {
@@ -350,7 +350,6 @@
 
 done:
 	talloc_free(options);
-	talloc_free(options_dn);
 	talloc_free(baseinfo);
 	talloc_free(baseinfo_dn);
 	talloc_free(indexlist_dn);
@@ -358,7 +357,6 @@
 
 failed:
 	talloc_free(options);
-	talloc_free(options_dn);
 	talloc_free(baseinfo);
 	talloc_free(baseinfo_dn);
 	talloc_free(indexlist_dn);