[CIFS] Fix mask so can set new cifs security flags properly

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 7c0015a96959337d66097bee53a82d05908ce21b..2f55edf2eeea1ef5b7fe5f93297fcdd45792cf47 100644 (file)
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -860,8 +860,6 @@ security_flags_write(struct file *file, const char __user *buffer,
        char flags_string[12];
        char c;
 
-       cERROR(1,("size %ld",count)); /* BB removeme BB */
-
        if((count < 1) || (count > 11))
                return -EINVAL;
 
@@ -883,14 +881,14 @@ security_flags_write(struct file *file, const char __user *buffer,
 
        flags = simple_strtoul(flags_string, NULL, 0);
 
-       cERROR(1,("sec flags 0x%x", flags));  /* BB FIXME make cFYI */
+       cFYI(1,("sec flags 0x%x", flags));
 
        if(flags <= 0)  {
                cERROR(1,("invalid security flags %s",flags_string));
                return -EINVAL;
        }
 
-       if((flags & CIFSSEC_MASK) != CIFSSEC_MASK) {
+       if(flags & ~CIFSSEC_MASK) {
                cERROR(1,("attempt to set unsupported security flags 0x%d",
                        flags & ~CIFSSEC_MASK));
                return -EINVAL;

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 0442c3b36799d8ba81a4e96c592cd597f21c5d3d..acae58313b0cb2b1bf18a0c60d247328537d7094 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -504,7 +504,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
 #endif /* CIFS_WEAK_PW_HASH */
                        cERROR(1,("Server requests plain text password"
                                  " but client support disabled"));
-               
+
        if(extended_security & CIFSSEC_MUST_NTLMV2)
                server->secType = NTLMv2;
        else

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 76a09f5f804fab7e95baaadccf830b9b6b4561a8..1fe9461c6dca4f97d70f3790dddd789bc0e2d3ff 100644 (file)
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -339,9 +339,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                return -EOPNOTSUPP;
 #endif
                wct = 10; /* lanman 2 style sessionsetup */
-       } else if((type == NTLM) || (type == NTLMv2)) /* NTLMv2 may retry NTLM */
+       } else if((type == NTLM) || (type == NTLMv2)) { 
+               /* For NTLMv2 failures eventually may need to retry NTLM */
                wct = 13; /* old style NTLM sessionsetup */
-       else /* same size for negotiate or auth, NTLMSSP or extended security */
+       } else /* same size for negotiate or auth, NTLMSSP or extended security */
                wct = 12;
 
        rc = small_smb_init_no_tc(SMB_COM_SESSION_SETUP_ANDX, wct, ses,