Index: /trunk/include/iprt/localipc.h
===================================================================
--- /trunk/include/iprt/localipc.h	(revision 58304)
+++ /trunk/include/iprt/localipc.h	(revision 58305)
@@ -75,10 +75,8 @@
 /** @name RTLocalIpcServerCreate flags
  * @{ */
-/** The server can handle multiple sessions. */
-#define RTLOCALIPC_FLAGS_MULTI_SESSION      RT_BIT_32(0)
 /** Native name, as apposed to a portable one. */
-#define RTLOCALIPC_FLAGS_NATIVE_NAME        RT_BIT_32(1)
+#define RTLOCALIPC_FLAGS_NATIVE_NAME        RT_BIT_32(0)
 /** The mask of valid flags. */
-#define RTLOCALIPC_FLAGS_VALID_MASK         UINT32_C(0x00000003)
+#define RTLOCALIPC_FLAGS_VALID_MASK         UINT32_C(0x00000001)
 /** @} */
 
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp	(revision 58304)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp	(revision 58305)
@@ -195,6 +195,5 @@
                                 VBOXTRAY_IPC_PIPE_PREFIX, pszUserName))
                 {
-                    rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName,
-                                                RTLOCALIPC_FLAGS_MULTI_SESSION);
+                    rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, 0 /*fFlags*/);
                     if (RT_SUCCESS(rc))
                     {
Index: /trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp
===================================================================
--- /trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp	(revision 58304)
+++ /trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp	(revision 58305)
@@ -207,7 +207,5 @@
     AssertPtrReturn(phServer, VERR_INVALID_POINTER);
     *phServer = NIL_RTLOCALIPCSERVER;
-
     AssertReturn(!(fFlags & ~RTLOCALIPC_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
-
     int rc = rtLocalIpcPosixValidateName(pszName, RT_BOOL(fFlags & RTLOCALIPC_FLAGS_NATIVE_NAME));
     if (RT_SUCCESS(rc))
@@ -248,5 +246,5 @@
                         if (RT_SUCCESS(rc))
                         {
-                            rc = rtSocketListen(pThis->hSocket, pThis->fFlags & RTLOCALIPC_FLAGS_MULTI_SESSION ? 10 : 0);
+                            rc = rtSocketListen(pThis->hSocket, 16);
                             if (RT_SUCCESS(rc))
                             {
Index: /trunk/src/VBox/Runtime/r3/win/localipc-win.cpp
===================================================================
--- /trunk/src/VBox/Runtime/r3/win/localipc-win.cpp	(revision 58304)
+++ /trunk/src/VBox/Runtime/r3/win/localipc-win.cpp	(revision 58305)
@@ -392,8 +392,6 @@
      */
     AssertPtrReturn(phServer, VERR_INVALID_POINTER);
-
+    *phServer = NIL_RTLOCALIPCSERVER;
     AssertReturn(!(fFlags & ~RTLOCALIPC_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
-    AssertReturn(fFlags & RTLOCALIPC_FLAGS_MULTI_SESSION, VERR_NOT_IMPLEMENTED); /** @todo Implement !RTLOCALIPC_FLAGS_MULTI_SESSION */
-
     size_t cwcFullName;
     int rc = rtLocalIpcWinValidateName(pszName, &cwcFullName, RT_BOOL(fFlags & RTLOCALIPC_FLAGS_NATIVE_NAME));
Index: /trunk/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp	(revision 58304)
+++ /trunk/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp	(revision 58305)
@@ -61,7 +61,7 @@
     RTLOCALIPCSERVER hIpcServer;
     int rc;
-    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, NULL, RTLOCALIPC_FLAGS_MULTI_SESSION), VERR_INVALID_POINTER);
+    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, NULL, 0), VERR_INVALID_POINTER);
     if (RT_SUCCESS(rc)) RTLocalIpcServerDestroy(hIpcServer);
-    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, "", RTLOCALIPC_FLAGS_MULTI_SESSION), VERR_INVALID_NAME);
+    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, "", 0), VERR_INVALID_NAME);
     if (RT_SUCCESS(rc)) RTLocalIpcServerDestroy(hIpcServer);
     RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, "BasicTest", 1234 /* Invalid flags */), VERR_INVALID_FLAGS);
@@ -72,5 +72,5 @@
 
     /* Basic server creation / destruction. */
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "BasicTest", RTLOCALIPC_FLAGS_MULTI_SESSION), VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "BasicTest", 0), VINF_SUCCESS);
     RTTESTI_CHECK_RC(RTLocalIpcServerCancel(hIpcServer), VINF_SUCCESS);
     RTTESTI_CHECK_RC(RTLocalIpcServerDestroy(hIpcServer), VINF_OBJECT_DESTROYED);
@@ -157,6 +157,5 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionConnection", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionConnection", 0), VINF_SUCCESS);
 
     /*
@@ -331,6 +330,5 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionWait", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionWait", 0), VINF_SUCCESS);
 
     /*
@@ -610,6 +608,5 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionData", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionData", 0), VINF_SUCCESS);
 
     /*
@@ -809,6 +806,5 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionPerf", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionPerf", 0), VINF_SUCCESS);
 
     /*