diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 23:33:16 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:53 +0100 |
| commit | da0f222f432c4fc8bf5da80baf849ca32b315ca0 (patch) | |
| tree | 3af5624aca9ce68b4b169ed1066dd03e8b2e7d9d /source4/auth | |
| parent | 5b357ca8774d97e85153151552bc052cfaf26c1b (diff) | |
| download | samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.tar.gz samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.tar.bz2 samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.zip | |
r26271: Remove some more uses of global_loadparm.
(This used to be commit e9875fcd56de0748ed78d7e3c9cdb4919cd96d3c)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/credentials/credentials_files.c | 10 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.c | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index f3f73f7fb1..1f4b467371 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -335,7 +335,8 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred) cred->machine_account_pending = false; filter = talloc_asprintf(cred, SECRETS_PRIMARY_DOMAIN_FILTER, cli_credentials_get_domain(cred)); - return cli_credentials_set_secrets(cred, global_loadparm, NULL, SECRETS_PRIMARY_DOMAIN_DN, + return cli_credentials_set_secrets(cred, global_loadparm, NULL, + SECRETS_PRIMARY_DOMAIN_DN, filter); } @@ -355,7 +356,8 @@ NTSTATUS cli_credentials_set_krbtgt(struct cli_credentials *cred) filter = talloc_asprintf(cred, SECRETS_KRBTGT_SEARCH, cli_credentials_get_realm(cred), cli_credentials_get_domain(cred)); - return cli_credentials_set_secrets(cred, global_loadparm, NULL, SECRETS_PRINCIPALS_DN, + return cli_credentials_set_secrets(cred, global_loadparm, NULL, + SECRETS_PRINCIPALS_DN, filter); } @@ -377,8 +379,8 @@ NTSTATUS cli_credentials_set_stored_principal(struct cli_credentials *cred, cli_credentials_get_realm(cred), cli_credentials_get_domain(cred), serviceprincipal); - return cli_credentials_set_secrets(cred, global_loadparm, NULL, SECRETS_PRINCIPALS_DN, - filter); + return cli_credentials_set_secrets(cred, global_loadparm, NULL, + SECRETS_PRINCIPALS_DN, filter); } /** diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index 7bfad689ef..b963b61f1f 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -141,7 +141,8 @@ int cli_credentials_set_ccache(struct cli_credentials *cred, return ENOMEM; } - ret = cli_credentials_get_krb5_context(cred, global_loadparm, &ccc->smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, + &ccc->smb_krb5_context); if (ret) { talloc_free(ccc); return ret; @@ -215,7 +216,8 @@ static int cli_credentials_new_ccache(struct cli_credentials *cred, struct ccach return ENOMEM; } - ret = cli_credentials_get_krb5_context(cred, global_loadparm, &ccc->smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, + &ccc->smb_krb5_context); if (ret) { talloc_free(ccc); return ret; @@ -225,7 +227,8 @@ static int cli_credentials_new_ccache(struct cli_credentials *cred, struct ccach return ENOMEM; } - ret = krb5_cc_resolve(ccc->smb_krb5_context->krb5_context, ccache_name, &ccc->ccache); + ret = krb5_cc_resolve(ccc->smb_krb5_context->krb5_context, ccache_name, + &ccc->ccache); if (ret) { DEBUG(1,("failed to generate a new krb5 ccache (%s): %s\n", ccache_name, |