Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1a67570c76402b36695cd0725e28649ee8fe830d
Commit:     1a67570c76402b36695cd0725e28649ee8fe830d
Parent:     1d9a8852c365fb7f8db0f8364210138985f457b8
Author:     Jeff Layton <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 31 04:03:02 2007 +0000
Committer:  Steve French <[EMAIL PROTECTED]>
CommitDate: Mon Dec 31 04:03:02 2007 +0000

    [CIFS]  use krb5 session key from first SMB session after a NegProt
    
    Currently, any new kerberos SMB session overwrites the server's session
    key. The session key should only be set by the first SMB session set up
    on the socket.
    
    Signed-off-by: Jeff Layton <[EMAIL PROTECTED]>
    Signed-off-by: Steve French <[EMAIL PROTECTED]>
---
 fs/cifs/sess.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index d0cb469..ce698d5 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -528,9 +528,11 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, 
int first_time,
                        rc = -EOVERFLOW;
                        goto ssetup_exit;
                }
-               ses->server->mac_signing_key.len = msg->sesskey_len;
-               memcpy(ses->server->mac_signing_key.data.krb5, msg->data,
-                       msg->sesskey_len);
+               if (first_time) {
+                       ses->server->mac_signing_key.len = msg->sesskey_len;
+                       memcpy(ses->server->mac_signing_key.data.krb5,
+                               msg->data, msg->sesskey_len);
+               }
                pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC;
                capabilities |= CAP_EXTENDED_SECURITY;
                pSMB->req.Capabilities = cpu_to_le32(capabilities);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to