From: Andrew Tridgell <tridge@samba.org> 
Date: Wed, 26 Jun 2002 06:39:18 +0000 (+0000)
Subject: reverted some bogus test code that jeremy accidentally committed
X-Git-Tag: samba-3.0.0alpha18~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b28ca8bd2a6613989bb23be951836d173296197;p=thirdparty%2Fsamba.git

reverted some bogus test code that jeremy accidentally committed
---

diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index c621d9a34e2..50d9edf5b2d 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -635,12 +635,10 @@ BOOL cli_session_setup(struct cli_state *cli,
 		return cli_session_setup_plaintext(cli, user, pass, workgroup);
 	}
 
-#if 0 /* JRATEST for signing. */
 	/* if the server supports extended security then use SPNEGO */
 	if (cli->capabilities & CAP_EXTENDED_SECURITY) {
 		return cli_session_setup_spnego(cli, user, pass, workgroup);
 	}
-#endif
 
 	/* otherwise do a NT1 style session setup */
 	return cli_session_setup_nt1(cli, user, 
@@ -825,10 +823,6 @@ BOOL cli_negprot(struct cli_state *cli)
 		cli->use_spnego = False;
 	}
 
-#if 1 /* JRA SIGN TEST */
-	cli->use_spnego = False;
-#endif
-
 	memset(cli->outbuf,'\0',smb_size);
 
 	/* setup the protocol strings */
@@ -893,10 +887,8 @@ BOOL cli_negprot(struct cli_state *cli)
 		if (getenv("CLI_FORCE_SMB_SIGNING"))
 			cli->sign_info.negotiated_smb_signing = True;
                                    
-#if 0
 		if (cli->sign_info.negotiated_smb_signing && !(cli->sec_mode & NEGOTIATE_SECURITY_SIGNATURES_ENABLED))
 			cli->sign_info.negotiated_smb_signing = False;
-#endif
 
 	} else if (cli->protocol >= PROTOCOL_LANMAN1) {
 		cli->use_spnego = False;