On Tue, 7 Sep 2010 19:13:31 -0500
Steve French <smfrench@xxxxxxxxx> wrote:
> This looks independent of the others - does this have dependencies on
> the rest of the series?
>
> On Mon, Sep 6, 2010 at 10:32 PM, <shirishpargaonkar@xxxxxxxxx> wrote:
> > From: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
> >
> > Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
> > ---
> > fs/cifs/cifssmb.c | 15 +++++++++------
> > 1 files changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
> > index c65c341..1f1b097 100644
> > --- a/fs/cifs/cifssmb.c
> > +++ b/fs/cifs/cifssmb.c
> > @@ -604,12 +604,15 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
> > else
> > rc = -EINVAL;
> >
> > - if (server->sec_kerberos || server->sec_mskerberos)
> > - server->secType = Kerberos;
> > - else if (server->sec_ntlmssp)
> > - server->secType = RawNTLMSSP;
> > - else
> > - rc = -EOPNOTSUPP;
> > + if (server->secType == Kerberos) {
> > + if (!server->sec_kerberos &&
> > + !server->sec_mskerberos)
> > + rc = -EOPNOTSUPP;
> > + } else if (server->secType == RawNTLMSSP) {
> > + if (!server->sec_ntlmssp)
> > + rc = -EOPNOTSUPP;
> > + } else
> > + rc = -EOPNOTSUPP;
> > }
> > } else
> > server->capabilities &= ~CAP_EXTENDED_SECURITY;
> > --
> > 1.6.0.2
> >
> >
>
>
>
Agreed. The patch to remove CalcNTLMv2_partial_mac_key is also
independent of the others too (at least, once it's fixed to remove the
declaration from the header too).
--
Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
