X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Finit.c;h=e81e38ab657f5696dc1ecf6ad264bb14e5a0effb;hb=0006ec0a46790567d3d49fcafce5ffaae08cdbf4;hp=04609b4b22018645a95e6faf10e1f318c1409376;hpb=6df9b5459294bcc9adf27f048508d43eea58a203;p=openldap

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 04609b4b22..e81e38ab65 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -12,6 +12,8 @@
 #include <ac/unistd.h>
 #include <ac/stdlib.h>
 
+#include <lutil.h>
+
 #include "back-bdb.h"
 #include "external.h"
 
@@ -30,20 +32,18 @@ static struct bdbi_database {
 	{ NULL, NULL, 0, 0 }
 };
 
-#if 0
+struct berval bdb_uuid = { 0, NULL };
+
 static int
-bdb_destroy( BackendInfo *bi )
+bdb_open( BackendInfo *bi )
 {
 	return 0;
 }
 
+#if 0
 static int
-bdb_open( BackendInfo *bi )
+bdb_destroy( BackendInfo *bi )
 {
-	/* initialize the underlying database system */
-	Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
-		0, 0, 0 );
-
 	return 0;
 }
 
@@ -410,6 +410,12 @@ bdb_initialize(
 		NULL
 	};
 
+	bi->bi_controls = controls;
+
+	/* initialize the underlying database system */
+	Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
+		0, 0, 0 );
+
 	{	/* version check */
 		int major, minor, patch;
 		char *version = db_version( &major, &minor, &patch );
@@ -419,12 +425,12 @@ bdb_initialize(
 			patch < DB_VERSION_PATCH )
 		{
 			Debug( LDAP_DEBUG_ANY,
-				"bi_back_initialize: version mismatch\n"
+				"bdb_open: version mismatch\n"
 				"\texpected: " DB_VERSION_STRING "\n"
 				"\tgot: %s \n", version, 0, 0 );
 		}
 
-		Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
+		Debug( LDAP_DEBUG_ANY, "bdb_open: %s\n",
 			version, 0, 0 );
 	}
 
@@ -436,7 +442,12 @@ bdb_initialize(
 
 	db_env_set_func_yield( ldap_pvt_thread_yield );
 
-	bi->bi_controls = controls;
+	{
+		static char uuidbuf[40];
+
+		bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ));
+		bdb_uuid.bv_val = uuidbuf;
+	}
 
 	bi->bi_open = 0;
 	bi->bi_close = 0;