From bd12560432b3a8faf124ae1f562b725f3b6686d9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Dec 2007 16:20:32 +0100 Subject: [PATCH] r26224: Remove another use of global_loadparm. --- source/auth/auth_server.c | 2 +- source/client/smbmount.c | 2 +- source/libcli/cliconnect.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c index b4fbeea2f..36637edd5 100644 --- a/source/auth/auth_server.c +++ b/source/auth/auth_server.c @@ -92,7 +92,7 @@ static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx) DEBUG(3,("got session\n")); - if (!smbcli_negprot(cli)) { + if (!smbcli_negprot(cli, lp_cli_maxprotocol(global_loadparm))) { DEBUG(1,("%s rejected the negprot\n",desthost)); release_server_mutex(); talloc_free(cli); diff --git a/source/client/smbmount.c b/source/client/smbmount.c index 8a106974c..1a1371eda 100644 --- a/source/client/smbmount.c +++ b/source/client/smbmount.c @@ -181,7 +181,7 @@ static struct smbcli_state *do_connection(char *the_service) DEBUG(4,("%d: session request ok\n", sys_getpid())); - if (!smbcli_negprot(c)) { + if (!smbcli_negprot(c, lp_cli_maxprotocol(global_loadparm))) { DEBUG(0,("%d: protocol negotiation failed\n", sys_getpid())); talloc_free(c); return NULL; diff --git a/source/libcli/cliconnect.c b/source/libcli/cliconnect.c index a56100fc8..d80665375 100644 --- a/source/libcli/cliconnect.c +++ b/source/libcli/cliconnect.c @@ -55,10 +55,9 @@ bool smbcli_transport_establish(struct smbcli_state *cli, } /* wrapper around smb_raw_negotiate() */ -NTSTATUS smbcli_negprot(struct smbcli_state *cli) +NTSTATUS smbcli_negprot(struct smbcli_state *cli, int maxprotocol) { - return smb_raw_negotiate(cli->transport, - lp_cli_maxprotocol(global_loadparm)); + return smb_raw_negotiate(cli->transport, maxprotocol); } /* wrapper around smb_raw_sesssetup() */ -- 2.34.1