diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 20:56:26 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:11 +0100 |
| commit | 120ecdb5cb7dbd7c650f3e9fbcefb925f695e0f2 (patch) | |
| tree | b7fa447f3959f84417d58a0b60ca8bb0c8de17b1 /source4/auth/credentials | |
| parent | da0640518f67545df6a1da30c916fbc452d38a39 (diff) | |
| download | samba-120ecdb5cb7dbd7c650f3e9fbcefb925f695e0f2.tar.gz samba-120ecdb5cb7dbd7c650f3e9fbcefb925f695e0f2.tar.bz2 samba-120ecdb5cb7dbd7c650f3e9fbcefb925f695e0f2.zip | |
r26233: Pass loadparm context when creating krb5 contexts.
(This used to be commit 7780bf285fdfc30f89409d0436bad0d4b6de5cd4)
Diffstat (limited to 'source4/auth/credentials')
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index edc10d77c9..7bfad689ef 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -26,8 +26,10 @@ #include "auth/kerberos/kerberos.h" #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_krb5.h" +#include "param/param.h" int cli_credentials_get_krb5_context(struct cli_credentials *cred, + struct loadparm_context *lp_ctx, struct smb_krb5_context **smb_krb5_context) { int ret; @@ -37,7 +39,7 @@ int cli_credentials_get_krb5_context(struct cli_credentials *cred, } ret = smb_krb5_init_context(cred, cli_credentials_get_event_context(cred), - &cred->smb_krb5_context); + lp_ctx, &cred->smb_krb5_context); if (ret) { return ret; } @@ -139,7 +141,7 @@ int cli_credentials_set_ccache(struct cli_credentials *cred, return ENOMEM; } - ret = cli_credentials_get_krb5_context(cred, &ccc->smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, &ccc->smb_krb5_context); if (ret) { talloc_free(ccc); return ret; @@ -213,7 +215,7 @@ static int cli_credentials_new_ccache(struct cli_credentials *cred, struct ccach return ENOMEM; } - ret = cli_credentials_get_krb5_context(cred, &ccc->smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, &ccc->smb_krb5_context); if (ret) { talloc_free(ccc); return ret; @@ -461,7 +463,7 @@ int cli_credentials_get_keytab(struct cli_credentials *cred, return EINVAL; } - ret = cli_credentials_get_krb5_context(cred, &smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, &smb_krb5_context); if (ret) { return ret; } @@ -507,7 +509,7 @@ int cli_credentials_set_keytab_name(struct cli_credentials *cred, return 0; } - ret = cli_credentials_get_krb5_context(cred, &smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, &smb_krb5_context); if (ret) { return ret; } @@ -545,7 +547,7 @@ int cli_credentials_update_keytab(struct cli_credentials *cred) return ENOMEM; } - ret = cli_credentials_get_krb5_context(cred, &smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, &smb_krb5_context); if (ret) { talloc_free(mem_ctx); return ret; @@ -585,7 +587,7 @@ int cli_credentials_get_server_gss_creds(struct cli_credentials *cred, return 0; } - ret = cli_credentials_get_krb5_context(cred, &smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, &smb_krb5_context); if (ret) { return ret; } |