Changeset 59133 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Dec 15, 2015 2:25:23 PM (9 years ago)

Author:

vboxsync

Message:

IPRT/process-win.cpp: Emphasize UPN (User Principal Name) handling on Windows.

File:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -602 +602 @@
  *
  * @returns IPRT status code.
- * @param   pwszUser            User name.
+ * @param   pwszUser            User name. A domain name can be specified (as part of a UPN, User Principal Name),
+ *                              e.g. "[email protected]".
  * @param   pwszPassword        Password.
- * @param   pwszDomain          Domain (not used at the moment).
  * @param   phToken             Pointer to store the logon token.
  */
-static int rtProcWinUserLogon(PRTUTF16 pwszUser, PRTUTF16 pwszPassword, PRTUTF16 pwszDomain, HANDLE *phToken)
+static int rtProcWinUserLogon(PRTUTF16 pwszUser, PRTUTF16 pwszPassword, HANDLE *phToken)
 {
     AssertPtrReturn(pwszUser, VERR_INVALID_POINTER);
     AssertPtrReturn(pwszPassword, VERR_INVALID_POINTER);
-    NOREF(pwszDomain); /** @todo Add domain support! */
 
     /*
@@ -621 +620 @@
      * is required on older windows versions (NT4, W2K, possibly XP).
      */
-    PCRTUTF16 pwszDomainToUse = g_enmWinVer < kRTWinOSType_2K ? L"" /* NT4 and older */ : NULL /* Windows 2000 and up */;
+    PCRTUTF16 pwszDomainNone = g_enmWinVer < kRTWinOSType_2K ? L"" /* NT4 and older */ : NULL /* Windows 2000 and up */;
     BOOL fRc = LogonUserW(pwszUser,
-                          pwszDomainToUse,
+                          /* The domain always is passed as part of the UPN (user name). */
+                          pwszDomainNone,
                           pwszPassword,
                           LOGON32_LOGON_INTERACTIVE,
@@ -1304 +1304 @@
     DWORD   dwErr       = NO_ERROR;
     HANDLE  hTokenLogon = INVALID_HANDLE_VALUE;
-    int rc = rtProcWinUserLogon(pwszUser, pwszPassword, NULL /* Domain */, &hTokenLogon);
+    int rc = rtProcWinUserLogon(pwszUser, pwszPassword, &hTokenLogon);
     if (RT_SUCCESS(rc))
     {
@@ -1620 +1620 @@
         RTENV  hEnvToUse = NIL_RTENV;
         HANDLE hToken;
-        rc = rtProcWinUserLogon(pwszUser, pwszPassword, NULL /* Domain */, &hToken);
+        rc = rtProcWinUserLogon(pwszUser, pwszPassword, &hToken);
         if (RT_SUCCESS(rc))
         {
@@ -2043 +2043 @@
                                        dwCreationFlags,
                                        pwszzBlock,
-                                       NULL,          /* pCurrentDirectory */
+                                       NULL,         /* pCurrentDirectory */
                                        &StartupInfo,
                                        &ProcInfo))