lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CIFS] formatting fixes

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Cyrill Gorcunov
2007-10-16 17:57:55 +00:00
committed by Steve French
parent 0d3a01fada
commit 6345a3a880
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/cifs/connect.c
View File

@@ -2950,8 +2950,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
strncpy(SecurityBlob->Signature, NTLMSSP_SIGNATURE, 8); strncpy(SecurityBlob->Signature, NTLMSSP_SIGNATURE, 8);
SecurityBlob->MessageType = NtLmAuthenticate; SecurityBlob->MessageType = NtLmAuthenticate;
bcc_ptr += SecurityBlobLength; bcc_ptr += SecurityBlobLength;
negotiate_flags = negotiate_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_REQUEST_TARGET |
NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_REQUEST_TARGET |
NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_TARGET_INFO | NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_TARGET_INFO |
0x80000000 | NTLMSSP_NEGOTIATE_128; 0x80000000 | NTLMSSP_NEGOTIATE_128;
if (sign_CIFS_PDUs) if (sign_CIFS_PDUs)
@@ -3104,12 +3103,11 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response,
&bytes_returned, 1); &bytes_returned, 1);
if (rc) { if (rc) {
/* rc = map_smb_to_linux_error(smb_buffer_response); *//* done in SendReceive now */ /* rc = map_smb_to_linux_error(smb_buffer_response) done in SendReceive now */
} else if ((smb_buffer_response->WordCount == 3) } else if ((smb_buffer_response->WordCount == 3) ||
|| (smb_buffer_response->WordCount == 4)) { (smb_buffer_response->WordCount == 4)) {
__u16 action = le16_to_cpu(pSMBr->resp.Action); __u16 action = le16_to_cpu(pSMBr->resp.Action);
__u16 blob_len = __u16 blob_len = le16_to_cpu(pSMBr->resp.SecurityBlobLength);
le16_to_cpu(pSMBr->resp.SecurityBlobLength);
if (action & GUEST_LOGIN) if (action & GUEST_LOGIN)
cFYI(1, (" Guest login")); /* BB Should we set anything cFYI(1, (" Guest login")); /* BB Should we set anything
in SesInfo struct ? */ in SesInfo struct ? */
@@ -3263,22 +3261,19 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
bcc_ptr[0] = 0; bcc_ptr[0] = 0;
bcc_ptr++; bcc_ptr++;
} else } else
cFYI(1, cFYI(1, ("field of length %d "
("field of length %d "
"extends beyond end of smb ", "extends beyond end of smb ",
len)); len));
} }
} else { } else {
cERROR(1, cERROR(1, ("Security Blob extends beyond end "
(" Security Blob extends beyond end "
"of SMB")); "of SMB"));
} }
} else { } else {
cERROR(1, ("No session structure passed in.")); cERROR(1, ("No session structure passed in."));
} }
} else { } else {
cERROR(1, cERROR(1, ("Invalid Word count %d: ",
(" Invalid Word count %d: ",
smb_buffer_response->WordCount)); smb_buffer_response->WordCount));
rc = -EIO; rc = -EIO;
} }