[linux-cifs-client] [RFC] Send null domain as default as we used to in 2.6.17 and earlier

[Steve French]

Comments?   Is it always better to send a null domain (as we used to 
before 2.6.18) rather than a bogus domain name if the user does not 
specify it?
Should we allow the default domain to be configured in /proc ?

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index a8a0835..8861234 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -98,10 +98,14 @@ static void unicode_ssetup_strings(char
        bcc_ptr += 2 * bytes_ret;
        bcc_ptr += 2; /* account for null termination */
        /* copy domain */
-       if(ses->domainName == NULL)
-               bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr,
-                                         "CIFS_LINUX_DOM", 32, nls_cp);
-       else
+       if(ses->domainName == NULL) {
+               /* Sending null domain is more likely to work
+               than sending a bogus domain */
+/*             bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr,
+                                         "CIFS_LINUX_DOM", 32, nls_cp);*/
+               *bcc_ptr = 0;
+               *(bcc_ptr+1) = 0;
+       } else
                bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, 
ses->domainName,
                                          256, nls_cp);
        bcc_ptr += 2 * bytes_ret;
@@ -144,13 +148,11 @@ static void ascii_ssetup_strings(char **

         /* copy domain */

-        if(ses->domainName == NULL) {
-                strcpy(bcc_ptr, "CIFS_LINUX_DOM");
-               bcc_ptr += 14;  /* strlen(CIFS_LINUX_DOM) */
-       } else {
+        if(ses->domainName != NULL) {
                 strncpy(bcc_ptr, ses->domainName, 256);
                bcc_ptr += strnlen(ses->domainName, 256);
-       }
+       } /* else we will send a null domain name
+            so the server will default to its own domain */
        *bcc_ptr = 0;
        bcc_ptr++;