Changeset 988 for vendor/current/source4/param/secrets.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/param/secrets.c (modified) (3 diffs)

vendor/current/source4/param/secrets.c

@@ -26 +26 @@
 #include "param/param.h"
 #include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/ldb-samba/ldb_wrap.h"
 #include <ldb.h>
@@ -34 +34 @@
 
 /**
- * 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 = 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
 */
@@ -89 +39 @@
                                         struct loadparm_context *lp_ctx)
 {
-        return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, lpcfg_secrets_url(lp_ctx),
+        return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, "secrets.ldb",
                                NULL, NULL, 0);
 }