From 0db8da31c56dc4ddbdd5f61732d47a69ed88acea Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Tue, 30 May 2006 18:08:26 +0000
Subject: [PATCH] --- yaml --- r: 27022 b: refs/heads/master c:
 08775834c412c48f3539ef7ed073fff58e3cf419 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f6d98abbe4ef..84672cd36ab4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cec6815a12edc91b123394f29d672cb9fa6cf79f
+refs/heads/master: 08775834c412c48f3539ef7ed073fff58e3cf419
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index f6ffb5bd29f7..bae1479318d1 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -2490,7 +2490,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 						} /* else no more room so create dummy domain string */
 						else {
 							if(ses->serverDomain)
-	`							kfree(ses->serverDomain);
+								kfree(ses->serverDomain);
 							ses->serverDomain =
 							    kzalloc(2,GFP_KERNEL);
 						}
@@ -2528,7 +2528,7 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 
 						len = strnlen(bcc_ptr, 1024);
 						if(ses->serverDomain)
-							kfree(ses->severDomain);
+							kfree(ses->serverDomain);
 						ses->serverDomain = kzalloc(len + 1, GFP_KERNEL);
 						strncpy(ses->serverDomain, bcc_ptr, len);
 						bcc_ptr += len;
@@ -3174,7 +3174,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
   the end since (at least) WIN2K and Windows XP have a major bug in not null
   terminating last Unicode string in response  */
 					if(ses->serverOS)
-						kfree(serverOS);
+						kfree(ses->serverOS);
 					ses->serverOS =
 					    kzalloc(2 * (len + 1), GFP_KERNEL);
 					cifs_strfromUCS_le(ses->serverOS,
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index c881a1a29f0b..5e59723c02bd 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -905,8 +905,8 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
 					break;
 			}
 			if(experimEnabled || (pTcon->ses->server &&
-				(pTcon->ses->server->secMode & 
-				(SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)
+				((pTcon->ses->server->secMode & 
+				(SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
 				== 0))) {
 				struct kvec iov[2];
 				unsigned int len;