svn commit: samba r26203 - in branches/SAMBA_4_0: . source/auth/gensec source/param

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-29 16:01:08 +0000 (Thu, 29 Nov 2007)
New Revision: 26203

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

Log:
Avoid using ldb_wrap for secrets database.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/gensec/config.mk
   branches/SAMBA_4_0/source/param/config.mk
   branches/SAMBA_4_0/source/param/secrets.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/config.mk	2007-11-29 16:01:05 UTC (rev 26202)
+++ branches/SAMBA_4_0/source/auth/gensec/config.mk	2007-11-29 16:01:08 UTC (rev 26203)
@@ -72,6 +72,7 @@
 PRIVATE_PROTO_HEADER = schannel_state.h
 OBJ_FILES = \
 		schannel_state.o
+PRIVATE_DEPENDENCIES = LDB_WRAP
 #
 # End SUBSYSTEM SCHANNELDB
 ################################################

Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk	2007-11-29 16:01:05 UTC (rev 26202)
+++ branches/SAMBA_4_0/source/param/config.mk	2007-11-29 16:01:08 UTC (rev 26203)
@@ -47,4 +47,4 @@
 
 [SUBSYSTEM::SECRETS]
 OBJ_FILES = secrets.o
-PRIVATE_DEPENDENCIES = LDB_WRAP TDB_WRAP UTIL_TDB
+PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB

Modified: branches/SAMBA_4_0/source/param/secrets.c
===================================================================
--- branches/SAMBA_4_0/source/param/secrets.c	2007-11-29 16:01:05 UTC (rev 26202)
+++ branches/SAMBA_4_0/source/param/secrets.c	2007-11-29 16:01:08 UTC (rev 26203)
@@ -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 @@
 
 	/* 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;
 }