Changeset 69729 in vbox for trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

Timestamp:

Nov 17, 2017 7:55:33 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119120

Message:

Main: Outlined a possible plan B for the VBoxSDS stuff.

File:

• trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -67 +67 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
 
 HRESULT CreateVirtualBoxThroughSDS(ComPtr<IVirtualBox> &aVirtualBox, ComPtr<IToken> &aToken)
@@ -238 +238 @@
 }
 
-#endif
+#endif /* RT_OS_WINDOWS && VBOX_WITH_SDS && !VBOX_WITH_SDS_PLAN_B */
 
 /**
@@ -250 +250 @@
 #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
     // setup COM Security to enable impersonation
-    // This works for console Virtual Box clients, GUI has own security settings
+    // This works for console VirtualBox clients, GUI has own security settings
     //  For GUI Virtual Box it will be second call so can return TOO_LATE error
     HRESULT hrGUICoInitializeSecurity = CoInitializeSecurity(NULL,
@@ -289 +289 @@
         mData.m_SemEvWatcher = NIL_RTSEMEVENT;
 
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
         rc = CreateVirtualBoxThroughSDS(mData.m_pVirtualBox, mData.m_pToken);
 #else
@@ -383 +383 @@
     IUnknown *pUnknown = NULL;
 
-# ifdef VBOX_WITH_SDS
+# if defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
     // Check the VBOXSDS service running account name is SYSTEM
     wchar_t wszBuffer[256];
@@ -746 +746 @@
                 ComPtr<IVirtualBox> pVirtualBox;
                 ComPtr<IToken> pToken;
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
                 rc = CreateVirtualBoxThroughSDS(pVirtualBox, pToken);
 #else