r26203: Avoid using ldb_wrap for secrets database.

diff --git a/source/auth/gensec/config.mk b/source/auth/gensec/config.mk
index 17954bbe5088183a83da4d8bcc47c0cfa18ed79b..8ee942c63ab926b40ee3b693081c0a5b5c91efce 100644 (file)
--- a/source/auth/gensec/config.mk
+++ b/source/auth/gensec/config.mk
@@ -72,6 +72,7 @@ OUTPUT_TYPE = INTEGRATED
 PRIVATE_PROTO_HEADER = schannel_state.h
 OBJ_FILES = \
                schannel_state.o
+PRIVATE_DEPENDENCIES = LDB_WRAP
 #
 # End SUBSYSTEM SCHANNELDB
 ################################################

diff --git a/source/param/config.mk b/source/param/config.mk
index 17a49eeef6c53128bf63a03c5c27bb77f5515cf0..24feec12bdcc5cd963c7c187b2773594e45d6f0d 100644 (file)
--- a/source/param/config.mk
+++ b/source/param/config.mk
@@ -47,4 +47,4 @@ PRIVATE_DEPENDENCIES = LIBLDB
 
 [SUBSYSTEM::SECRETS]
 OBJ_FILES = secrets.o
-PRIVATE_DEPENDENCIES = LDB_WRAP TDB_WRAP UTIL_TDB
+PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB

diff --git a/source/param/secrets.c b/source/param/secrets.c
index c749d38bb23d759efabdd17a7756cd08ccbfee0b..308c5a607beecb5e0fb47b2f2c559638d2c86202 100644 (file)
--- a/source/param/secrets.c
+++ b/source/param/secrets.c
@@ -26,7 +26,6 @@
 #include "param/param.h"
 #include "system/filesys.h"
 #include "tdb_wrap.h"
-#include "ldb_wrap.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/util/util_tdb.h"
@@ -118,11 +117,18 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
 
        /* Secrets.ldb *must* always be local.  If we call for a
         * system_session() we will recurse */
-       ldb = ldb_wrap_connect(mem_ctx, global_loadparm, path, NULL, NULL, 0, NULL);
-       talloc_free(path);
+       ldb = ldb_init(mem_ctx);
        if (!ldb) {
+               talloc_free(path);
+               return NULL;
+       }
+
+       if (ldb_connect(ldb, path, 0, NULL) != 0) {
+               talloc_free(path);
                return NULL;
        }
+
+       talloc_free(path);
        
        return ldb;
 }