diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 22:32:11 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:15 +0100 |
| commit | 6c999cd12344f2bb8b1d2941210b4c205b3e0aad (patch) | |
| tree | 0911e4ca75694e080173c2863e2c41ff5881309c /source4/auth | |
| parent | 934e932387ea5668ec000bcefe4ec86935297339 (diff) | |
| download | samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.tar.gz samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.tar.bz2 samba-6c999cd12344f2bb8b1d2941210b4c205b3e0aad.zip | |
r26236: Remove more uses of global_loadparm or specify loadparm_context explicitly.
(This used to be commit 5b29ef7c03d9ae76b0ca909e9f03a58e1bad3521)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth_server.c | 6 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/auth/auth_server.c b/source4/auth/auth_server.c index d391793bd9..900ca8d05e 100644 --- a/source4/auth/auth_server.c +++ b/source4/auth/auth_server.c @@ -24,7 +24,7 @@ Support for server level security. ****************************************************************************/ -static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx, int maxprotocol) +static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx, bool unicode, int maxprotocol) { struct smbcli_state *cli = NULL; fstring desthost; @@ -92,7 +92,7 @@ static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx, int maxprotocol DEBUG(3,("got session\n")); - if (!smbcli_negprot(cli, maxprotocol)) { + if (!smbcli_negprot(cli, unicode, maxprotocol)) { DEBUG(1,("%s rejected the negprot\n",desthost)); release_server_mutex(); talloc_free(cli); @@ -215,7 +215,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context if (cli) { } else { - cli = server_cryptkey(mem_ctx, lp_cli_maxprotocol(auth_context->lp_ctx)); + cli = server_cryptkey(mem_ctx, lp_unicode(auth_context->lp_ctx), lp_cli_maxprotocol(auth_context->lp_ctx)); locally_made_cli = true; } diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index 1227a48ada..391d231f97 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -116,7 +116,7 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security) talloc_set_destructor(gensec_krb5_state, gensec_krb5_destroy); - if (cli_credentials_get_krb5_context(creds, &gensec_krb5_state->smb_krb5_context)) { + if (cli_credentials_get_krb5_context(creds, global_loadparm, &gensec_krb5_state->smb_krb5_context)) { talloc_free(gensec_krb5_state); return NT_STATUS_INTERNAL_ERROR; } |