Internal branch sync. Included in this change:

. Fix incorrect MXUserNativeRWRelease read/write mode.

. changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 20104acb83c334903fc17bfad73e00263448f570..4200298d8c0445fbead43f5f6a6314797a5fece1 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -594,4 +594,15 @@
  */
 #define HOST_AGENT_SERVICE_NAME     "VMwareHostd"
 
+// Name of the environment variable that controls which proxy server to use
+// while opening connections to vCenter and vSphere servers. Currently vCloud
+// VMRC uses it.
+#define VMWARE_HTTPSPROXY  "VMWARE_HTTPSPROXY"
+
+// Name of the environment variable that controls whether MKS traffic should
+// be tunnelled over HTTPS through the console proxy. Currently vCloud VMRC
+// uses it.
+#define VMWARE_HTTPSTUNNEL_MKS   "VMWARE_HTTPSTUNNEL_MKS"
+
+
 #endif /* VM_PRODUCT_H */

diff --git a/open-vm-tools/lib/lock/ulRW.c b/open-vm-tools/lib/lock/ulRW.c
index da201f9731aa7a21cf9819a7ebaed695ef27750f..041211dff96e225a75723008dd675bc0271b4526 100644 (file)
--- a/open-vm-tools/lib/lock/ulRW.c
+++ b/open-vm-tools/lib/lock/ulRW.c
@@ -942,7 +942,8 @@ MXUser_ReleaseRWLock(MXUserRWLock *lock)  // IN/OUT:
    Atomic_Dec(&lock->holderCount);
 
    if (LIKELY(lock->useNative)) {
-      int err = MXUserNativeRWRelease(&lock->nativeLock, myContext->state);
+      int err = MXUserNativeRWRelease(&lock->nativeLock,
+                                      myContext->state == RW_LOCKED_FOR_READ);
 
       if (UNLIKELY(err != 0)) {
          MXUserDumpAndPanic(&lock->header, "%s: Internal error (%d)\n",