svn commit: samba r26224 - in branches/SAMBA_4_0: . source/auth source/client source/libcli

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-02 16:20:32 +0000 (Sun, 02 Dec 2007)
New Revision: 26224

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26224

Log:
Remove another use of global_loadparm.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/auth_server.c
   branches/SAMBA_4_0/source/client/smbmount.c
   branches/SAMBA_4_0/source/libcli/cliconnect.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/auth_server.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_server.c	2007-12-02 16:20:29 UTC (rev 26223)
+++ branches/SAMBA_4_0/source/auth/auth_server.c	2007-12-02 16:20:32 UTC (rev 26224)
@@ -92,7 +92,7 @@
 	
 	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);

Modified: branches/SAMBA_4_0/source/client/smbmount.c
===================================================================
--- branches/SAMBA_4_0/source/client/smbmount.c	2007-12-02 16:20:29 UTC (rev 26223)
+++ branches/SAMBA_4_0/source/client/smbmount.c	2007-12-02 16:20:32 UTC (rev 26224)
@@ -181,7 +181,7 @@
 
 	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;

Modified: branches/SAMBA_4_0/source/libcli/cliconnect.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/cliconnect.c	2007-12-02 16:20:29 UTC (rev 26223)
+++ branches/SAMBA_4_0/source/libcli/cliconnect.c	2007-12-02 16:20:32 UTC (rev 26224)
@@ -55,10 +55,9 @@
 }
 
 /* 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() */