Internal branch sync. Included in this change:

. turn on vgauth for authn checks
. changes in shared code that don't affect open-vm-tools functionality

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index b3e1e2eca36b6b3dde8435da9816d00f0a32c9b5..29fbd38eca0407843136d1a2eb4eb10d8ac2a7e0 100644 (file)
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -77,8 +77,8 @@
 /*
  * vigor (must be < VMDB range and < disklib, see bug 741290)
  */
-#define RANK_vigorClientLock         (RANK_libLockBase + 0x4400)
-#define RANK_vigorOfflineClientLock  (RANK_libLockBase + 0x4410)
+#define RANK_vigorOnlineLock         (RANK_libLockBase + 0x4400)
+#define RANK_vigorOfflineLock        (RANK_libLockBase + 0x4410)
 
 /*
  * NFC lib lock

diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 46ec910ac7a4339c5799c07ddc2af3960901ad9d..9f02047fd804503f3271374b6f885c52ed24f330 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -138,11 +138,7 @@
 #define VMTOOLSD_APP_NAME "vmtoolsd"
 
 #define VIXTOOLS_CONFIG_USE_VGAUTH_NAME "useVGAuth"
-/*
- * XXX Leave this off by default until the VGAuth service is being
- * officially installed.
- */
-#define USE_VGAUTH_DEFAULT FALSE
+#define USE_VGAUTH_DEFAULT TRUE
 
 static gboolean gSupportVGAuth = USE_VGAUTH_DEFAULT;
 static gboolean QueryVGAuthConfig(GKeyFile *confDictRef);