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

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c
index 54f3ce2d0780389f019e1168e3f943eef5bbe218..270c1b3f13628fee2d7bede0f50ccd8f285ef245 100644 (file)
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -84,7 +84,7 @@ static NTSTATUS cli_credentials_set_secrets_lct(struct cli_credentials *cred,
 
        if (!ldb) {
                /* Local secrets are stored in secrets.ldb */
-               ldb = secrets_db_connect(mem_ctx, lp_ctx);
+               ldb = secrets_db_connect(mem_ctx, lp_ctx, 0);
                if (!ldb) {
                        *error_string = talloc_strdup(cred, "Could not open secrets.ldb");
                        talloc_free(mem_ctx);

diff --git a/source4/param/provision.c b/source4/param/provision.c
index 47f296afcdd023d9f1e679ace070a420e0635443..36ba3ba76a9c76a000398b783c851f423a9f1d0f 100644 (file)
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -346,7 +346,7 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
        }
 
        /* Open the secrets database */
-       ldb = secrets_db_connect(tmp_mem, lp_ctx);
+       ldb = secrets_db_connect(tmp_mem, lp_ctx, 0);
        if (!ldb) {
                *error_string
                        = talloc_asprintf(mem_ctx, 

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 987408829ea5bad4caa689cb48d78c3a3c1a3021..c047b7fd1a4218b40243e28667747e44aee78b34 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -36,10 +36,11 @@
   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, "secrets.ldb",
-                              NULL, NULL, 0);
+                              NULL, NULL, flags);
 }
 
 /**

diff --git a/source4/param/secrets.h b/source4/param/secrets.h
index 015ea1200411b76b9c90e9cfb5bce94ce399ca33..2f55ea6073934620df88aaae548e38876a5c6503 100644 (file)
--- a/source4/param/secrets.h
+++ b/source4/param/secrets.h
@@ -37,7 +37,9 @@ struct ldb_context;
 
 bool randseed_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
 
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx,
+                                      struct loadparm_context *lp_ctx,
+                                      unsigned int flags);
 struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
                                       struct loadparm_context *lp_ctx,
                                       const char *domain,

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index cbbd9f482f2c28c76472e579332cddfab47cf50f..8deedf3a5eff5c890100af2983d55963512214e5 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -3288,7 +3288,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
                }
 
                secret_state->sam_ldb = talloc_reference(secret_state,
-                                                        secrets_db_connect(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
+                                                        secrets_db_connect(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, 0));
                NT_STATUS_HAVE_NO_MEMORY(secret_state->sam_ldb);
 
                /* search for the secret record */
@@ -3425,7 +3425,7 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
        } else {
                secret_state->global = false;
                secret_state->sam_ldb = talloc_reference(secret_state,
-                                                        secrets_db_connect(mem_ctx, dce_call->conn->dce_ctx->lp_ctx));
+                                                        secrets_db_connect(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, 0));
 
                name = r->in.name.string;
                if (strlen(name) < 1) {