Changeset 29529 in vbox for trunk

Timestamp:

May 17, 2010 11:17:38 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Do not specify user name + password on non-Windows platforms until RTProcCreateEx() can handle this.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (7 diffs)

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

@@ -579 +579 @@
     int rc = RTCritSectEnter(&pBuf->CritSect);
     if (RT_SUCCESS(rc))
-    {    
+    {
         Assert(pBuf->cbOffset >= pBuf->cbRead);
         if (*pcbToRead > pBuf->cbOffset - pBuf->cbRead)
             *pcbToRead = pBuf->cbOffset - pBuf->cbRead;
-    
+
         if (*pcbToRead > cbBuffer)
             *pcbToRead = cbBuffer;
-    
+
         if (*pcbToRead > 0)
         {
@@ -609 +609 @@
     int rc = RTCritSectEnter(&pBuf->CritSect);
     if (RT_SUCCESS(rc))
-    {    
+    {
         /** @todo Use RTMemCache or RTMemObj here? */
         uint8_t *pNewBuf;
@@ -620 +620 @@
             pBuf->pbData = pNewBuf;
         }
-        
+
         rc = VINF_SUCCESS;
         if (pBuf->pbData)
@@ -647 +647 @@
     AssertPtr(pThread);
 
-    /* General stuff. */    
+    /* General stuff. */
     pThread->Node.pPrev = NULL;
     pThread->Node.pNext = NULL;
@@ -730 +730 @@
 {
     if (pData)
-    {    
+    {
         RTStrFree(pData->pszCmd);
         if (pData->uNumEnvVars)
@@ -741 +741 @@
         RTStrFree(pData->pszUser);
         RTStrFree(pData->pszPassword);
-    
+
         VBoxServiceControlExecDestroyPipeBuffer(&pData->stdOut);
         VBoxServiceControlExecDestroyPipeBuffer(&pData->stdErr);
@@ -826 +826 @@
                                 rc = RTProcCreateEx(pData->pszCmd, pData->papszArgs, hEnv, RTPROC_FLAGS_SERVICE,
                                                     phStdIn, phStdOut, phStdErr,
+                            #ifdef RT_OS_WINDOWS
                                                     strlen(pData->pszUser) ? pData->pszUser : NULL,
                                                     strlen(pData->pszUser) && strlen(pData->pszPassword) ? pData->pszPassword : NULL,
+                            #else
+                                                    /*
+                                                     * Never specify a user name and password until RTProcCreateEx supports
+                                                     * that for non-Windows (POSIX) platforms.
+                                                     */
+                                                    NULL, NULL,
+                            #endif
                                                     &hProcess);
                                 if (RT_SUCCESS(rc))