Changeset 25874 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 18, 2010 8:54:14 AM (15 years ago)

Author:

vboxsync

Message:

VBoxGINA: Added one more check for NetBIOS names.

File:

• trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp

@@ -126 +126 @@
             EnableWindow(hwndDomain, FALSE);
         }
-        else 
+        else
         {
             Log(("VBoxGINA::MyWlxLoggedOutSASDlgProc: Domain not found in combo box ...\n"));
@@ -143 +143 @@
                 Log(("VBoxGINA::MyWlxLoggedOutSASDlgProc: Warning! FQDN is too long (max 255 bytes), will be truncated!\n"));
 
-            if (   l > 0 
-                && wcslen(g_Username) > 0
-                && wcsstr(g_Domain, L".") != NULL) /* if we found a dot (.) in the domain name, this has to be a FQDN */
+            if (wcslen(g_Username) > 0) /* We need a user name that we can use in caes of a FQDN */
             {
-                Log(("VBoxGINA::MyWlxLoggedOutSASDlgProc: Domain seems to be a FQDN!\n"));
-                swprintf(szUserFQDN, sizeof(szUserFQDN) / sizeof(wchar_t), L"%s@%s", g_Username, g_Domain);
-                bIsFQDN = TRUE;
+                if (l > 16) /* Domain name is longer than 16 chars, cannot be a NetBIOS name anymore */
+                {
+                    Log(("VBoxGINA::MyWlxLoggedOutSASDlgProc: Domain seems to be a FQDN (length)!\n"));
+                    bIsFQDN = TRUE;
+                }
+                else if (   l > 0
+                         && wcsstr(g_Domain, L".") != NULL) /* if we found a dot (.) in the domain name, this has to be a FQDN */
+                {
+                    Log(("VBoxGINA::MyWlxLoggedOutSASDlgProc: Domain seems to be a FQDN (dot)!\n"));
+                    bIsFQDN = TRUE;
+                }
+    
+                if (bIsFQDN)
+                {
+                    swprintf(szUserFQDN, sizeof(szUserFQDN) / sizeof(wchar_t), L"%s@%s", g_Username, g_Domain);
+                    Log(("VBoxGINA::MyWlxLoggedOutSASDlgProc: FQDN user name is now: %s!\n", szUserFQDN));
+                }
             }
         }
@@ -158 +170 @@
             SendMessage(hwndUserId, WM_SETTEXT, 0, (LPARAM)g_Username);
         else
-            SendMessage(hwndUserId, WM_SETTEXT, 0, (LPARAM)szUserFQDN);                               
+            SendMessage(hwndUserId, WM_SETTEXT, 0, (LPARAM)szUserFQDN);
     }
     if (hwndPassword)
@@ -218 +230 @@
                     /* we got the credentials, null them out */
                     credentialsReset();
-                
+
                     /* confirm the logon dialog, simulating the user pressing "OK" */
                     WPARAM wParam = MAKEWPARAM(IDOK, BN_CLICKED);