From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:35:10 +0000 (-0700)
Subject: Internal branch sync. Included in this change:
X-Git-Tag: 2013.09.16-1328054~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6f49a9aa54be295fb2a8537a0924a8c806cbb19;p=thirdparty%2Fopen-vm-tools.git

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 b3e1e2eca..29fbd38ec 100644
--- 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 46ec910ac..9f02047fd 100644
--- 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);