Changeset 59145 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Dec 16, 2015 8:47:41 AM (9 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Forgot to add the "--domain" handling; should fix the testcases.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (4 diffs)

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

@@ -48 +48 @@
 {
     VBOXSERVICESESSIONOPT_FIRST = 1000, /* For initialization. */
+    VBOXSERVICESESSIONOPT_DOMAIN,
 #ifdef DEBUG
     VBOXSERVICESESSIONOPT_DUMP_STDOUT,
@@ -2116 +2117 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
+        { "--domain",          VBOXSERVICESESSIONOPT_DOMAIN,          RTGETOPT_REQ_STRING },
 #ifdef DEBUG
         { "--dump-stdout",     VBOXSERVICESESSIONOPT_DUMP_STDOUT,     RTGETOPT_REQ_NOTHING },
@@ -2148 +2150 @@
         switch (ch)
         {
+            case VBOXSERVICESESSIONOPT_DOMAIN:
+                /* Information not needed right now, skip. */
+                break;
+#ifdef DEBUG
+            case VBOXSERVICESESSIONOPT_DUMP_STDOUT:
+                fSession |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDOUT;
+                break;
+
+            case VBOXSERVICESESSIONOPT_DUMP_STDERR:
+                fSession |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDERR;
+                break;
+#endif
+            case VBOXSERVICESESSIONOPT_SESSION_ID:
+                g_Session.StartupInfo.uSessionID = ValueUnion.u32;
+                break;
+
+            case VBOXSERVICESESSIONOPT_SESSION_PROTO:
+                g_Session.StartupInfo.uProtocol = ValueUnion.u32;
+                break;
+#ifdef DEBUG
+            case VBOXSERVICESESSIONOPT_THREAD_ID:
+                /* Not handled. Mainly for processs listing. */
+                break;
+#endif
             case VBOXSERVICESESSIONOPT_LOG_FILE:
             {
@@ -2155 +2181 @@
                 break;
             }
-#ifdef DEBUG
-            case VBOXSERVICESESSIONOPT_DUMP_STDOUT:
-                fSession |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDOUT;
-                break;
-
-            case VBOXSERVICESESSIONOPT_DUMP_STDERR:
-                fSession |= VBOXSERVICECTRLSESSION_FLAG_DUMPSTDERR;
-                break;
-#endif
+
             case VBOXSERVICESESSIONOPT_USERNAME:
                 /* Information not needed right now, skip. */
                 break;
 
-            case VBOXSERVICESESSIONOPT_SESSION_ID:
-                g_Session.StartupInfo.uSessionID = ValueUnion.u32;
-                break;
-
-            case VBOXSERVICESESSIONOPT_SESSION_PROTO:
-                g_Session.StartupInfo.uProtocol = ValueUnion.u32;
-                break;
-
-#ifdef DEBUG
-            case VBOXSERVICESESSIONOPT_THREAD_ID:
-                /* Not handled. Mainly for processs listing. */
-                break;
-#endif
             /** @todo Implement help? */