r18245: Ensure we don't keep the rootdse record around (steal it onto the

correct memory context).

Andrew Bartlett
(This used to be commit b4f234e507fa94e9600c362fb6edb704d299cfce)

diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 04ac3e7d812136115f3bf79937155f01973d7508..5aa243ac7ad839ea9ffc77d9f1930010cbd08f73 100644 (file)
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -162,12 +162,14 @@ static const struct ldb_dn *ldb_set_default_basedn(struct ldb_context *ldb)
        tmp_ctx = talloc_new(ldb);
        ret = ldb_search(ldb, ldb_dn_new(tmp_ctx), LDB_SCOPE_BASE, 
                         "(objectClass=*)", attrs, &res);
-       if (ret == LDB_SUCCESS && res->count == 1) {
-               basedn = ldb_msg_find_attr_as_dn(ldb, res->msgs[0], "defaultNamingContext");
+       if (ret == LDB_SUCCESS) {
+               talloc_steal(tmp_ctx, res);
+               if (res->count == 1) {
+                       basedn = ldb_msg_find_attr_as_dn(ldb, res->msgs[0], "defaultNamingContext");
+                       ldb_set_opaque(ldb, "default_baseDN", basedn);
+               }
        }
 
-       ldb_set_opaque(ldb, "default_baseDN", basedn);
-
        talloc_free(tmp_ctx);
        return basedn;
 }