From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 24 Feb 2017 14:36:24 +0000 (+0100)
Subject: s4:param: pass flags via secrets_db_connect() to ldb_wrap_connect()
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=fc0529af6399eff95cc608caa2b80a1a400381a7

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 54f3ce2d0780..270c1b3f1362 100644
--- 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 47f296afcdd0..36ba3ba76a9c 100644
--- 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 987408829ea5..c047b7fd1a42 100644
--- 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 015ea1200411..2f55ea607393 100644
--- 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 cbbd9f482f2c..8deedf3a5eff 100644
--- 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) {