diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-11-15 11:01:14 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:45:21 +0100 |
| commit | fe61b63393e1deaf98982841ce3693ee63af52f0 (patch) | |
| tree | 24ece1c27bca028cf93640b400956c29a51c97ad /source4 | |
| parent | 04cf937b8de8b055767b87965a996e3c7741d266 (diff) | |
| download | samba-fe61b63393e1deaf98982841ce3693ee63af52f0.tar.gz samba-fe61b63393e1deaf98982841ce3693ee63af52f0.tar.bz2 samba-fe61b63393e1deaf98982841ce3693ee63af52f0.zip | |
r25964: Fix comment and use talloc hirachy in ldb_tdb initialisation.
Andrew Bartlett
(This used to be commit 05cc2a7d966a10f1f111d7bae3261e1087fdffe6)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_cache.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c index 77922a97c7..2576e2c7bd 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_cache.c +++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c @@ -307,7 +307,7 @@ int ltdb_cache_load(struct ldb_module *module) 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 @@ int ltdb_cache_load(struct ldb_module *module) 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 @@ int ltdb_cache_load(struct ldb_module *module) done: talloc_free(options); - talloc_free(options_dn); talloc_free(baseinfo); talloc_free(baseinfo_dn); talloc_free(indexlist_dn); @@ -358,7 +357,6 @@ done: failed: talloc_free(options); - talloc_free(options_dn); talloc_free(baseinfo); talloc_free(baseinfo_dn); talloc_free(indexlist_dn); |