svn commit: samba r17595 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_23/source/libsmb

[jra at samba.org]

Author: jra
Date: 2006-08-17 19:49:54 +0000 (Thu, 17 Aug 2006)
New Revision: 17595

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

Log:
Fix from Ben Winslow <rain at bluecherry.net> to allow
client smb signing to be correctly turned off.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/smb_signing.c
   branches/SAMBA_3_0_23/source/libsmb/smb_signing.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/smb_signing.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/smb_signing.c	2006-08-17 16:57:42 UTC (rev 17594)
+++ branches/SAMBA_3_0/source/libsmb/smb_signing.c	2006-08-17 19:49:54 UTC (rev 17595)
@@ -108,6 +108,10 @@
 
 static BOOL cli_set_smb_signing_common(struct cli_state *cli) 
 {
+	if (!cli->sign_info.allow_smb_signing) {
+		return False;
+	}
+
 	if (!cli->sign_info.negotiated_smb_signing 
 	    && !cli->sign_info.mandatory_signing) {
 		return False;

Modified: branches/SAMBA_3_0_23/source/libsmb/smb_signing.c
===================================================================
--- branches/SAMBA_3_0_23/source/libsmb/smb_signing.c	2006-08-17 16:57:42 UTC (rev 17594)
+++ branches/SAMBA_3_0_23/source/libsmb/smb_signing.c	2006-08-17 19:49:54 UTC (rev 17595)
@@ -108,6 +108,10 @@
 
 static BOOL cli_set_smb_signing_common(struct cli_state *cli) 
 {
+	if (!cli->sign_info.allow_smb_signing) {
+		return False;
+	}
+
 	if (!cli->sign_info.negotiated_smb_signing 
 	    && !cli->sign_info.mandatory_signing) {
 		return False;