Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

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

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 657d2f7998a1cafc5e9fc8d8f1c6c81a302e10d3..bc4327188ad44c659af2d646b39638ac65a87d47 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -25,11 +25,12 @@
 #include "secrets.h"
 #include "param/param.h"
 #include "system/filesys.h"
-#include "db_wrap.h"
+#include "tdb_wrap.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/util/util_tdb.h"
-#include "dsdb/samdb/samdb.h"
+#include "lib/util/util_ldb.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static struct tdb_wrap *tdb;
 
@@ -44,36 +45,41 @@ static struct tdb_wrap *tdb;
 static void get_rand_seed(int *new_seed) 
 {
        *new_seed = getpid();
-       if (tdb) {
+       if (tdb != NULL) {
                tdb_change_int32_atomic(tdb->tdb, "INFO/random_seed", new_seed, 1);
        }
 }
 
-/* close the secrets database */
+/**
+ * close the secrets database
+ */
 void secrets_shutdown(void)
 {
        talloc_free(tdb);
 }
 
-/* open up the secrets database */
-BOOL secrets_init(void)
+/**
+ * open up the secrets database
+ */
+bool secrets_init(struct loadparm_context *lp_ctx)
 {
        char *fname;
        uint8_t dummy;
 
-       if (tdb)
-               return True;
+       if (tdb != NULL)
+               return true;
 
-       asprintf(&fname, "%s/secrets.tdb", lp_private_dir());
+       fname = private_path(NULL, lp_ctx, "secrets.tdb");
 
-       tdb = tdb_wrap_open(talloc_autofree_context(), 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));
-               SAFE_FREE(fname);
-               return False;
+               talloc_free(fname);
+               return false;
        }
-       SAFE_FREE(fname);
+       talloc_free(fname);
 
        /**
         * Set a reseed function for the crypto random generator 
@@ -86,51 +92,55 @@ BOOL secrets_init(void)
        /* Ensure that the reseed is done now, while we are root, etc */
        generate_random_buffer(&dummy, sizeof(dummy));
 
-       return True;
+       return true;
 }
 
-/*
-  connect to the schannel ldb
+/**
+  connect to the secrets ldb
 */
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
        char *path;
        const char *url;
        struct ldb_context *ldb;
-       BOOL existed;
-       const char *init_ldif = 
-               "dn: @ATTRIBUTES\n" \
-               "computerName: CASE_INSENSITIVE\n" \
-               "flatname: CASE_INSENSITIVE\n";
 
-       url = lp_secrets_url();
+       url = lp_secrets_url(lp_ctx);
        if (!url || !url[0]) {
                return NULL;
        }
 
-       path = private_path(mem_ctx, url);
+       path = private_path(mem_ctx, lp_ctx, url);
        if (!path) {
                return NULL;
        }
 
-       existed = file_exist(path);
-
        /* Secrets.ldb *must* always be local.  If we call for a
         * system_session() we will recurse */
-       ldb = ldb_wrap_connect(mem_ctx, path, NULL, NULL, 0, NULL);
-       talloc_free(path);
+       ldb = ldb_init(mem_ctx);
        if (!ldb) {
+               talloc_free(path);
                return NULL;
        }
-       
-       if (!existed) {
-               gendb_add_ldif(ldb, init_ldif);
+
+       ldb_set_modules_dir(ldb, 
+                           talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(lp_ctx)));
+
+       if (ldb_connect(ldb, path, 0, NULL) != 0) {
+               talloc_free(path);
+               return NULL;
        }
 
+       talloc_free(path);
+       
        return ldb;
 }
 
+/**
+ * Retrieve the domain SID from the secrets database.
+ * @return pointer to a SID object if the SID could be obtained, NULL otherwise
+ */
 struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
+                                      struct loadparm_context *lp_ctx,
                                       const char *domain)
 {
        struct ldb_context *ldb;
@@ -138,8 +148,10 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
        int ldb_ret;
        const char *attrs[] = { "objectSid", NULL };
        struct dom_sid *result = NULL;
+       const struct ldb_val *v;
+       enum ndr_err_code ndr_err;
 
-       ldb = secrets_db_connect(mem_ctx);
+       ldb = secrets_db_connect(mem_ctx, lp_ctx);
        if (ldb == NULL) {
                DEBUG(5, ("secrets_db_connect failed\n"));
                return NULL;
@@ -170,10 +182,22 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       result = samdb_result_dom_sid(mem_ctx, msgs[0], "objectSid");
-       if (result == NULL) {
+       v = ldb_msg_find_ldb_val(msgs[0], "objectSid");
+       if (v == NULL) {
                DEBUG(0, ("Domain object for %s does not contain a SID!\n",
                          domain));
+               return NULL;
+       }
+       result = talloc(mem_ctx, struct dom_sid);
+       if (result == NULL) {
+               talloc_free(ldb);
+               return NULL;
+       }
+
+       ndr_err = ndr_pull_struct_blob(v, result, NULL, result,
+                                      (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               talloc_free(result);
                talloc_free(ldb);
                return NULL;
        }