summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-02 16:20:32 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:00 +0100
commit8d8ad81437555affe0ce189ab9b7049501c708b1 (patch)
treeb5e2aa75ea1c4ad42b8ff74e70d4c84bd10d7535 /source4
parent25f286fdfe0cf7ac800ccf3ac62ee5e1d2ceb583 (diff)
downloadsamba-8d8ad81437555affe0ce189ab9b7049501c708b1.tar.gz
samba-8d8ad81437555affe0ce189ab9b7049501c708b1.tar.bz2
samba-8d8ad81437555affe0ce189ab9b7049501c708b1.zip
r26224: Remove another use of global_loadparm.
(This used to be commit bd12560432b3a8faf124ae1f562b725f3b6686d9)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/auth_server.c2
-rw-r--r--source4/client/smbmount.c2
-rw-r--r--source4/libcli/cliconnect.c5
3 files changed, 4 insertions, 5 deletions
diff --git a/source4/auth/auth_server.c b/source4/auth/auth_server.c
index b4fbeea2f5..36637edd57 100644
--- a/source4/auth/auth_server.c
+++ b/source4/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/source4/client/smbmount.c b/source4/client/smbmount.c
index 8a106974c2..1a1371edae 100644
--- a/source4/client/smbmount.c
+++ b/source4/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/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index a56100fc80..d806653758 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/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() */