diff options
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r-- | fs/cifs/sess.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 08dd37bb23aa..a0a62db0f575 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
@@ -226,7 +226,7 @@ static void unicode_ssetup_strings(char **pbcc_area, struct cifs_ses *ses, | |||
226 | *(bcc_ptr+1) = 0; | 226 | *(bcc_ptr+1) = 0; |
227 | } else { | 227 | } else { |
228 | bytes_ret = cifs_strtoUTF16((__le16 *) bcc_ptr, ses->user_name, | 228 | bytes_ret = cifs_strtoUTF16((__le16 *) bcc_ptr, ses->user_name, |
229 | MAX_USERNAME_SIZE, nls_cp); | 229 | CIFS_MAX_USERNAME_LEN, nls_cp); |
230 | } | 230 | } |
231 | bcc_ptr += 2 * bytes_ret; | 231 | bcc_ptr += 2 * bytes_ret; |
232 | bcc_ptr += 2; /* account for null termination */ | 232 | bcc_ptr += 2; /* account for null termination */ |
@@ -246,8 +246,8 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses, | |||
246 | /* BB what about null user mounts - check that we do this BB */ | 246 | /* BB what about null user mounts - check that we do this BB */ |
247 | /* copy user */ | 247 | /* copy user */ |
248 | if (ses->user_name != NULL) { | 248 | if (ses->user_name != NULL) { |
249 | strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE); | 249 | strncpy(bcc_ptr, ses->user_name, CIFS_MAX_USERNAME_LEN); |
250 | bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE); | 250 | bcc_ptr += strnlen(ses->user_name, CIFS_MAX_USERNAME_LEN); |
251 | } | 251 | } |
252 | /* else null user mount */ | 252 | /* else null user mount */ |
253 | *bcc_ptr = 0; | 253 | *bcc_ptr = 0; |
@@ -501,7 +501,7 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, | |||
501 | } else { | 501 | } else { |
502 | int len; | 502 | int len; |
503 | len = cifs_strtoUTF16((__le16 *)tmp, ses->domainName, | 503 | len = cifs_strtoUTF16((__le16 *)tmp, ses->domainName, |
504 | MAX_USERNAME_SIZE, nls_cp); | 504 | CIFS_MAX_USERNAME_LEN, nls_cp); |
505 | len *= 2; /* unicode is 2 bytes each */ | 505 | len *= 2; /* unicode is 2 bytes each */ |
506 | sec_blob->DomainName.BufferOffset = cpu_to_le32(tmp - pbuffer); | 506 | sec_blob->DomainName.BufferOffset = cpu_to_le32(tmp - pbuffer); |
507 | sec_blob->DomainName.Length = cpu_to_le16(len); | 507 | sec_blob->DomainName.Length = cpu_to_le16(len); |
@@ -517,7 +517,7 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, | |||
517 | } else { | 517 | } else { |
518 | int len; | 518 | int len; |
519 | len = cifs_strtoUTF16((__le16 *)tmp, ses->user_name, | 519 | len = cifs_strtoUTF16((__le16 *)tmp, ses->user_name, |
520 | MAX_USERNAME_SIZE, nls_cp); | 520 | CIFS_MAX_USERNAME_LEN, nls_cp); |
521 | len *= 2; /* unicode is 2 bytes each */ | 521 | len *= 2; /* unicode is 2 bytes each */ |
522 | sec_blob->UserName.BufferOffset = cpu_to_le32(tmp - pbuffer); | 522 | sec_blob->UserName.BufferOffset = cpu_to_le32(tmp - pbuffer); |
523 | sec_blob->UserName.Length = cpu_to_le16(len); | 523 | sec_blob->UserName.Length = cpu_to_le16(len); |