Message ID | CADT32eL4na+eduUmmWKHe5usN+S2aN+mCUQqU5j8RHaq-3ZVwQ@mail.gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 01/26/2014 10:07 PM, Shirish Pargaonkar wrote: > Can you try this patch and see if it works? We have verified that this works in our test systems. We are just passing user=foo,password=bar in our mount options, so hopefully that is sufficient to exercise this code? Thanks, Ben > diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c > index e87387d..ac14d71 100644 > --- a/fs/cifs/sess.c > +++ b/fs/cifs/sess.c > @@ -450,9 +450,8 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, > sec_blob->WorkstationName.MaximumLength = 0; > tmp += 2; > > - if (((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) || > - (ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_EXTENDED_SEC)) > - && !calc_seckey(ses)) { > + if ((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) && > + !calc_seckey(ses)) { > memcpy(tmp, ses->ntlmssp->ciphertext, CIFS_CPHTXT_SIZE); > sec_blob->SessionKey.BufferOffset = cpu_to_le32(tmp - pbuffer); > sec_blob->SessionKey.Length = cpu_to_le16(CIFS_CPHTXT_SIZE);
username=foo is preferred On Mon, Feb 3, 2014 at 11:54 AM, Ben Greear <greearb@candelatech.com> wrote: > On 01/26/2014 10:07 PM, Shirish Pargaonkar wrote: >> Can you try this patch and see if it works? > > We have verified that this works in our test systems. > We are just passing user=foo,password=bar in our > mount options, so hopefully that is sufficient to exercise this > code? > > Thanks, > Ben > >> diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c >> index e87387d..ac14d71 100644 >> --- a/fs/cifs/sess.c >> +++ b/fs/cifs/sess.c >> @@ -450,9 +450,8 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, >> sec_blob->WorkstationName.MaximumLength = 0; >> tmp += 2; >> >> - if (((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) || >> - (ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_EXTENDED_SEC)) >> - && !calc_seckey(ses)) { >> + if ((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) && >> + !calc_seckey(ses)) { >> memcpy(tmp, ses->ntlmssp->ciphertext, CIFS_CPHTXT_SIZE); >> sec_blob->SessionKey.BufferOffset = cpu_to_le32(tmp - pbuffer); >> sec_blob->SessionKey.Length = cpu_to_le16(CIFS_CPHTXT_SIZE); > > -- > Ben Greear <greearb@candelatech.com> > Candela Technologies Inc http://www.candelatech.com > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks. Will post a patch on the mailing list. Regards, Shirish On Mon, Feb 3, 2014 at 11:54 AM, Ben Greear <greearb@candelatech.com> wrote: > On 01/26/2014 10:07 PM, Shirish Pargaonkar wrote: >> Can you try this patch and see if it works? > > We have verified that this works in our test systems. > We are just passing user=foo,password=bar in our > mount options, so hopefully that is sufficient to exercise this > code? > > Thanks, > Ben > >> diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c >> index e87387d..ac14d71 100644 >> --- a/fs/cifs/sess.c >> +++ b/fs/cifs/sess.c >> @@ -450,9 +450,8 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, >> sec_blob->WorkstationName.MaximumLength = 0; >> tmp += 2; >> >> - if (((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) || >> - (ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_EXTENDED_SEC)) >> - && !calc_seckey(ses)) { >> + if ((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) && >> + !calc_seckey(ses)) { >> memcpy(tmp, ses->ntlmssp->ciphertext, CIFS_CPHTXT_SIZE); >> sec_blob->SessionKey.BufferOffset = cpu_to_le32(tmp - pbuffer); >> sec_blob->SessionKey.Length = cpu_to_le16(CIFS_CPHTXT_SIZE); > > -- > Ben Greear <greearb@candelatech.com> > Candela Technologies Inc http://www.candelatech.com > -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index e87387d..ac14d71 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -450,9 +450,8 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, sec_blob->WorkstationName.MaximumLength = 0; tmp += 2; - if (((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) || - (ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_EXTENDED_SEC)) - && !calc_seckey(ses)) { + if ((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) && + !calc_seckey(ses)) { memcpy(tmp, ses->ntlmssp->ciphertext, CIFS_CPHTXT_SIZE); sec_blob->SessionKey.BufferOffset = cpu_to_le32(tmp - pbuffer); sec_blob->SessionKey.Length = cpu_to_le16(CIFS_CPHTXT_SIZE);