From 639d957b03d38b53244cb461f37898b1f03c290f Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 31 Dec 2007 04:03:02 +0000
Subject: [PATCH] --- yaml --- r: 77295 b: refs/heads/master c:
 1a67570c76402b36695cd0725e28649ee8fe830d h: refs/heads/master i:   77293:
 cff8f93ee19e84dcf301456eccb47dd492bc3595   77291:
 9502e6f3b48b20d932320510019e3579d64ea97a   77287:
 5a7a4eb2df543706a5efa388bfad1599677149c0   77279:
 73dd5ce007ba8d0cf239f6f54b969c8c589a5cbd v: v3

---
 [refs]               | 2 +-
 trunk/fs/cifs/sess.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 022fef48390d..d7a5c81dc440 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d9a8852c365fb7f8db0f8364210138985f457b8
+refs/heads/master: 1a67570c76402b36695cd0725e28649ee8fe830d
diff --git a/trunk/fs/cifs/sess.c b/trunk/fs/cifs/sess.c
index d0cb469daab7..ce698d5f6107 100644
--- a/trunk/fs/cifs/sess.c
+++ b/trunk/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);