r26224: Remove another use of global_loadparm.

(This used to be commit bd12560432b3a8faf124ae1f562b725f3b6686d9)

diff --git a/source4/auth/auth_server.c b/source4/auth/auth_server.c
index b4fbeea2f5128c432dbd5ae0312d8829c509752c..36637edd57bd481b46766029b66f77b9357ace38 100644 (file)
--- 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 8a106974c2f682a353fd8d6303237679e459a602..1a1371edae8d7f03d7ade07a9d05b78572705f3f 100644 (file)
--- 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 a56100fc80c50294d11dec09624f8126fb353306..d80665375818544d2ff6f1138cde20750b28ca11 100644 (file)
--- 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() */