Internal branch sync. Included in this change:

. lib/file: fix ASSERT that was too strict and fired too often.

. 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/file/fileStandAlone.c b/open-vm-tools/lib/file/fileStandAlone.c
index a02087b9c06195fae828fed41347641b3420a1b6..009f680f8dac3f68b0353f3c23a1535e884ffbcf 100644 (file)
--- a/open-vm-tools/lib/file/fileStandAlone.c
+++ b/open-vm-tools/lib/file/fileStandAlone.c
@@ -344,21 +344,6 @@ File_PathJoin(ConstUnicode dirName,   // IN:
    ASSERT(dirName);
    ASSERT(baseName);
 
-   /*
-    * This code concatenates two strings together and omits a
-    * redundant directory separator between the two. It does not
-    * treat a fully qualified baseName the way one would expect:
-    * File_PathJoin("C:\temp", C:thing") -> "C:\temp\C:thing"
-    * File_PathJoin("/var/tmp", "/tempfile-123") -> "/var/tmp//tempfile-123"
-    * We ASSERT here to catch unintentional common-case coding errors on
-    * non-release builds, but we'll still return weird results if we're
-    * dealing with unusual user contributed data on release builds.
-    *
-    * The alternative is to return baseName if (File_IsFullPath(baseName)),
-    * but that was not the original intent of this function.
-    */
-   ASSERT(!File_IsFullPath(baseName));
-
    if (Unicode_EndsWith(dirName, DIRSEPS)) {
       result = Unicode_Append(dirName, baseName);
    } else {

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index eaf18adeb72fdabc1b80c896b46eb4e61e2cf03d..c863a66f00c12efd3e4783b112179578fffbe404 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -127,6 +127,8 @@
 
 #define PRODUCT_FDM_NAME MAKE_NAME("Fault Domain Manager")
 
+#define PRODUCT_HA_NAME MAKE_NAME("High Availability Extension")
+
 #define PRODUCT_WBC_NAME MAKE_NAME("WebCenter")
 
 #define PRODUCT_SDK_NAME MAKE_NAME("SDK")
@@ -315,7 +317,9 @@
 #     define PRODUCT_SHORT_NAME PRODUCT_API_SCRIPTING_PERL_NAME
 #  endif
 #elif defined(VMX86_VPX)
-#  if defined(CSI_FDM)
+#  if defined(CSI_HA)
+#     define PRODUCT_SHORT_NAME PRODUCT_HA_NAME     
+#  elif defined(CSI_FDM)
 #     define PRODUCT_SHORT_NAME PRODUCT_FDM_NAME
 #  elif defined(VPXA)
 #     define PRODUCT_SHORT_NAME PRODUCT_VPXA_NAME

diff --git a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
index 8d5b7ce6d1a615ba922d3950b192559879bb0334..c2f13541b9ab17573e87a6ee9b7e03ae380c7726 100644 (file)
--- a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2004 VMware, Inc. All rights reserved.
+ * Copyright (C) 2004-2011 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -81,7 +81,7 @@
 #define VMNET_CAP_TSO256k      0x200000        /* Can do TSO segmentation offload for pkts up to 256kB. */
 #define VMNET_CAP_UPT          0x400000        /* Support UPT */
 #define VMNET_CAP_RDONLY_INETHDRS 0x800000 /* Modifies inet headers for TSO/CSUm */
-#define VMNET_CAP_NPA         0x1000000        /* Support NPA */
+#define VMNET_CAP_ENCAP         0x1000000   /* NPA not used, so redefining for ENCAP support */
 #define VMNET_CAP_DCB         0x2000000        /* Support DCB */
 #define VMNET_CAP_OFFLOAD_8OFFSET 0x4000000 /* supports 8bit parameterized offsets */ 
 #define VMNET_CAP_OFFLOAD_16OFFSET 0x8000000 /* supports 16bit parameterized offsets */