]> err.no Git - linux-2.6/commitdiff
[CIFS] Fix typos in previous fix
authorSteve French <sfrench@us.ibm.com>
Tue, 30 May 2006 18:08:26 +0000 (18:08 +0000)
committerSteve French <sfrench@us.ibm.com>
Tue, 30 May 2006 18:08:26 +0000 (18:08 +0000)
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/connect.c
fs/cifs/file.c

index f6ffb5bd29f77592096cbdeabd7b03eda7ce0ad5..bae1479318d10fc6fd34a141a564aeb49252ba80 100644 (file)
@@ -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,
index c881a1a29f0b14d4e85f7fd172af2858f778597a..5e59723c02bd72e20d790b60fcbae5add48a480d 100644 (file)
@@ -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;