Changeset 28347 in vbox

Timestamp:

Apr 15, 2010 7:49:38 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (logon error handling).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -678 +678 @@
                                 rc = RTProcCreateEx(pData->pszCmd, pData->papszArgs, hEnv, pData->uFlags,
                                                     phStdIn, phStdOut, phStdErr,
-                                                    /*pszUsername, pszPassword,*/ NULL, NULL,
+                                                    strlen(pData->pszUser) ? pData->pszUser : NULL, 
+                                                    strlen(pData->pszUser) && strlen(pData->pszPassword) ? pData->pszPassword : NULL, 
                                                     &hProcess);
                                 if (RT_SUCCESS(rc))

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -249 +249 @@
                                                     Bstr(Utf8UserName), Bstr(Utf8Password), uTimeoutMS,
                                                     &uPID, progress.asOutParam()));
-            if (verbose) RTPrintf("Process \"%s\" (PID: %u) started.\n", Utf8Cmd.raw(), uPID);
+            if (verbose) RTPrintf("Process '%s' (PID: %u) started.\n", Utf8Cmd.raw(), uPID);
             if (waitForOutput)
             {

trunk/src/VBox/Main/GuestImpl.cpp

@@ -613 +613 @@
         }
 
+        Utf8Str Utf8StdIn(aStdIn);
+        Utf8Str Utf8StdOut(aStdOut);
+        Utf8Str Utf8StdErr(aStdErr);
+        Utf8Str Utf8UserName(aUserName);
+        Utf8Str Utf8Password(aPassword);
         if (RT_SUCCESS(vrc))
         {
@@ -637 +642 @@
                         break;
                 }
-    
+
                 if (RT_SUCCESS(vrc))
-                {
-                    Utf8Str Utf8StdIn(aStdIn);
-                    Utf8Str Utf8StdOut(aStdOut);
-                    Utf8Str Utf8StdErr(aStdErr);
-                    Utf8Str Utf8UserName(aUserName);
-                    Utf8Str Utf8Password(aPassword);
-                
+                {               
                     PHOSTEXECCALLBACKDATA pData = (HOSTEXECCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECCALLBACKDATA));
                     AssertPtr(pData);
@@ -737 +736 @@
                     {
                         rc = setError(VBOX_E_IPRT_ERROR, 
-                                      tr("The file \"%s\" was not found on guest"), Utf8Command.raw());
+                                      tr("The file '%s' was not found on guest"), Utf8Command.raw());
                     }
                     else if (vrc == VERR_BAD_EXE_FORMAT)
                     {
                         rc = setError(VBOX_E_IPRT_ERROR, 
-                                      tr("The file \"%s\" is not an executable format on guest"), Utf8Command.raw());
+                                      tr("The file '%s' is not an executable format on guest"), Utf8Command.raw());
+                    }
+                    else if (vrc == VERR_LOGON_FAILURE)
+                    {
+                        rc = setError(VBOX_E_IPRT_ERROR, 
+                                      tr("The specified user '%s' was not able to logon on guest"), Utf8UserName.raw());
                     }
                     else if (vrc == VERR_TIMEOUT)
@@ -752 +756 @@
                     {
                         rc = setError(E_UNEXPECTED,
-                                      tr("The service call failed with the error %Rrc"), vrc);
+                                      tr("The service call failed with error %Rrc"), vrc);
                     }
                 }