r5102: This is a major simplification of the logic for controlling top level

[abartlet/samba.git/.git] / source4 / passdb / secrets.c

diff --git a/source4/passdb/secrets.c b/source4/passdb/secrets.c
index add3845d75dbcb499852bf12a1a5d5fa4b3398cf..14e5642ae2d9953462da4cd8709a148a0120f8a8 100644 (file)
--- a/source4/passdb/secrets.c
+++ b/source4/passdb/secrets.c
@@ -23,6 +23,7 @@
    such as the local SID and machine trust password */
 
 #include "includes.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
@@ -45,11 +46,17 @@ static void get_rand_seed(int *new_seed)
        }
 }
 
+/* close the secrets database */
+void secrets_shutdown(void)
+{
+       talloc_free(tdb);
+}
+
 /* open up the secrets database */
 BOOL secrets_init(void)
 {
        pstring fname;
-       char dummy;
+       uint8_t dummy;
 
        if (tdb)
                return True;
@@ -57,7 +64,7 @@ BOOL secrets_init(void)
        pstrcpy(fname, lp_private_dir());
        pstrcat(fname,"/secrets.tdb");
 
-       tdb = tdb_wrap_open(NULL, fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       tdb = tdb_wrap_open(talloc_autofree_context(), fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 
        if (!tdb) {
                DEBUG(0,("Failed to open %s\n", fname));
@@ -81,7 +88,7 @@ BOOL secrets_init(void)
 /* read a entry from the secrets database - the caller must free the result
    if size is non-null then the size of the entry is put in there
  */
-static void *secrets_fetch(const char *key, size_t *size)
+void *secrets_fetch(const char *key, size_t *size)
 {
        TDB_DATA kbuf, dbuf;
        secrets_init();
@@ -123,6 +130,10 @@ BOOL secrets_named_mutex(const char *name, uint_t timeout, size_t *p_ref_count)
        size_t ref_count = *p_ref_count;
        int ret = 0;
 
+       secrets_init();
+       if (!tdb)
+               return False;
+
        if (ref_count == 0) {
                ret = tdb_lock_bystring(tdb->tdb, name, timeout);
                if (ret == 0)
@@ -146,6 +157,10 @@ void secrets_named_mutex_release(const char *name, size_t *p_ref_count)
 
        SMB_ASSERT(ref_count != 0);
 
+       secrets_init();
+       if (!tdb)
+               return;
+
        if (ref_count == 1) {
                tdb_unlock_bystring(tdb->tdb, name);
                DEBUG(10,("secrets_named_mutex: released mutex for %s\n", name ));
@@ -155,3 +170,25 @@ void secrets_named_mutex_release(const char *name, size_t *p_ref_count)
        DEBUG(10,("secrets_named_mutex_release: ref_count for mutex %s = %u\n", name, (uint_t)ref_count ));
 }
 
+/*
+  connect to the schannel ldb
+*/
+struct ldb_wrap *secrets_db_connect(TALLOC_CTX *mem_ctx)
+{
+       char *path;
+       struct ldb_wrap *ldb;
+
+       path = private_path(mem_ctx, "secrets.ldb");
+       if (!path) {
+               return NULL;
+       }
+       
+       ldb = ldb_wrap_connect(mem_ctx, path, 0, NULL);
+       talloc_free(path);
+       if (!ldb) {
+               return NULL;
+       }
+
+       return ldb;
+}
+