s4:param: pass flags via secrets_db_connect() to ldb_wrap_connect()

[metze/samba/wip.git] / source4 / param / secrets.c

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 70690a5e3bc1a654854b864bbd346f1688481963..c047b7fd1a4218b40243e28667747e44aee78b34 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -25,71 +25,22 @@
 #include "secrets.h"
 #include "param/param.h"
 #include "system/filesys.h"
-#include "tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/ldb-samba/ldb_wrap.h"
 #include <ldb.h>
 #include "../lib/util/util_tdb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "dsdb/samdb/samdb.h"
 
-/**
- * Use a TDB to store an incrementing random seed.
- *
- * Initialised to the current pid, the very first time Samba starts,
- * and incremented by one each time it is needed.  
- * 
- * @note Not called by systems with a working /dev/urandom.
- */
-static void get_rand_seed(struct tdb_wrap *secretsdb, int *new_seed) 
-{
-       *new_seed = getpid();
-       if (secretsdb != NULL) {
-               tdb_change_int32_atomic(secretsdb->tdb, "INFO/random_seed", new_seed, 1);
-       }
-}
-
-/**
- * open up the secrets database
- */
-struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-       char *fname;
-       uint8_t dummy;
-       struct tdb_wrap *tdb;
-
-       fname = lpcfg_private_path(mem_ctx, lp_ctx, "secrets.tdb");
-
-       tdb = tdb_wrap_open(mem_ctx, fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-
-       if (!tdb) {
-               DEBUG(0,("Failed to open %s\n", fname));
-               talloc_free(fname);
-               return NULL;
-       }
-       talloc_free(fname);
-
-       /**
-        * Set a reseed function for the crypto random generator 
-        * 
-        * This avoids a problem where systems without /dev/urandom
-        * could send the same challenge to multiple clients
-        */
-       set_rand_reseed_callback((void (*) (void *, int *))get_rand_seed, tdb);
-
-       /* Ensure that the reseed is done now, while we are root, etc */
-       generate_random_buffer(&dummy, sizeof(dummy));
-
-       return tdb;
-}
-
 /**
   connect to the secrets ldb
 */
 struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx,
-                                       struct loadparm_context *lp_ctx)
+                                       struct loadparm_context *lp_ctx,
+                                       unsigned int flags)
 {
-       return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, lpcfg_secrets_url(lp_ctx),
-                              NULL, NULL, 0);
+       return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, "secrets.ldb",
+                              NULL, NULL, flags);
 }
 
 /**