summaryrefslogtreecommitdiff
path: root/source4/auth/credentials
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-29 16:01:16 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:46:51 +0100
commit991ee1aff092187bcfdd0ee1d9eb15361f73d5f7 (patch)
tree791d32dde17b8d4612b8526d5d81ef81a681928b /source4/auth/credentials
parent0e191fa26ab6f0f4119eccca0170e5ebd7f46382 (diff)
downloadsamba-991ee1aff092187bcfdd0ee1d9eb15361f73d5f7.tar.gz
samba-991ee1aff092187bcfdd0ee1d9eb15361f73d5f7.tar.bz2
samba-991ee1aff092187bcfdd0ee1d9eb15361f73d5f7.zip
r26205: Pass loadparm_context to secrets_db_connect() rather than using global context.
(This used to be commit 5718b6cfee86ddfc9cf405c98c68ba848df4d9d7)
Diffstat (limited to 'source4/auth/credentials')
-rw-r--r--source4/auth/credentials/credentials.c1
-rw-r--r--source4/auth/credentials/credentials_files.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index d6c0bbc0ba..8510a1f711 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -229,7 +229,6 @@ bool cli_credentials_set_principal(struct cli_credentials *cred,
/* Set a callback to get the principal. This could be a popup dialog,
* a terminal prompt or similar. */
-
bool cli_credentials_set_principal_callback(struct cli_credentials *cred,
const char *(*principal_cb) (struct cli_credentials *))
{
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index db69fc1cb4..2d850956e2 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -212,7 +212,7 @@ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
if (!ldb) {
/* Local secrets are stored in secrets.ldb */
- ldb = secrets_db_connect(mem_ctx);
+ ldb = secrets_db_connect(mem_ctx, global_loadparm);
if (!ldb) {
/* set anonymous as the fallback, if the machine account won't work */
cli_credentials_set_anonymous(cred);