From: VMware, Inc <>
Date: Thu, 18 Nov 2010 22:28:22 +0000 (-0800)
Subject: Internal branch sync. Included in this change:
X-Git-Tag: 2010.11.17-327185~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8367f01a7d433f9643ccc03b84ba2c40c2b9751d;p=thirdparty%2Fopen-vm-tools.git

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 20104acb8..4200298d8 100644
--- 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 da201f973..041211dff 100644
--- 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",