1 files changed, 12 insertions, 11 deletions

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 22b4c35dcfe3..a8a083543ba0 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -268,6 +268,10 @@ static int decode_ascii_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo
         ses->serverOS = kzalloc(len + 1, GFP_KERNEL);
         if(ses->serverOS)
                 strncpy(ses->serverOS, bcc_ptr, len);
+        if(strncmp(ses->serverOS, "OS/2",4) == 0) {
+                        cFYI(1,("OS/2 server"));
+                        ses->flags |= CIFS_SES_OS2;
+        }
 
         bcc_ptr += len + 1;
         bleft -= len + 1;
@@ -290,16 +294,11 @@ static int decode_ascii_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo
         if(len > bleft)
                 return rc;
 
-        if(ses->serverDomain)
-                kfree(ses->serverDomain);
-
-        ses->serverDomain = kzalloc(len + 1, GFP_KERNEL);
-        if(ses->serverOS)
-                strncpy(ses->serverOS, bcc_ptr, len);
-
-        bcc_ptr += len + 1;
-        bleft -= len + 1;
-
+        /* No domain field in LANMAN case. Domain is
+           returned by old servers in the SMB negprot response */
+        /* BB For newer servers which do not support Unicode,
+           but thus do return domain here we could add parsing
+           for it later, but it is not very important */
         cFYI(1,("ascii: bytes left %d",bleft));
 
         return rc;
@@ -366,6 +365,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
         str_area = kmalloc(2000, GFP_KERNEL);
         bcc_ptr = str_area;
 
+        ses->flags &= ~CIFS_SES_LANMAN;
+
         if(type == LANMAN) {
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
                 char lnm_session_key[CIFS_SESS_KEY_SIZE];
@@ -377,7 +378,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                 /* and copy into bcc */
 
                 calc_lanman_hash(ses, lnm_session_key);
-
+                ses->flags |= CIFS_SES_LANMAN; 
 /* #ifdef CONFIG_CIFS_DEBUG2
                 cifs_dump_mem("cryptkey: ",ses->server->cryptKey,
                         CIFS_SESS_KEY_SIZE);