Changes to common source files not directly applicable to open-vm-tools

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 06ca031ee0ba209bbcfd75d79108de267e61482c..a3003203a319d6664e5874c622ff0994c42c5f15 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -77,6 +77,7 @@
  * This name should be used when referring to VMware Tools
  */
 #define VMWARE_TOOLS_SHORT_NAME MAKE_NAME("Tools")
+#define VMWARE_VGAUTH_SHORT_NAME MAKE_NAME("Guest Authentication")
 
 #define PRODUCT_SCALABLE_SERVER_NAME MAKE_NAME(PRODUCT_SCALABLE_SERVER_BRIEF_NAME)
 #define PRODUCT_ESXI_NAME MAKE_NAME(PRODUCT_ESXI_BRIEF_NAME)
@@ -215,6 +216,8 @@
 # define PRODUCT_SHORT_NAME PRODUCT_VMRC_NAME
 #elif defined(VMX86_TOOLS)
 # define PRODUCT_SHORT_NAME VMWARE_TOOLS_SHORT_NAME
+#elif defined(VMX86_VGAUTH)
+# define PRODUCT_SHORT_NAME VMWARE_VGAUTH_SHORT_NAME
 #elif defined(VMX86_VPX)
 #  if defined(CSI_HA)
 #     define PRODUCT_SHORT_NAME PRODUCT_HA_NAME

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index d0411ef150e6447f2a4e681d55f253d7b4e026df..9a9b6d2b71111238f3e26d49dbf3ca8fa9d8472a 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -264,7 +264,7 @@
 #define VCSA_INSTALLER_VERSION "1.0.0"
 #define OVFTOOL_FILE_VERSION 4,3,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #define VDM_CLIENT_VERSION "4.5.1"
-#define VGAUTH_VERSION "e.x.p"
+#define VGAUTH_VERSION "1.0.0"
 #define COMMON_AGENT_VERSION "e.x.p"
 #define VIEWY_VERSION "e.x.p"
 #define VMCFSDK_VERSION "e.x.p"
@@ -359,7 +359,9 @@
 #  define PRODUCT_VERSION_NUMBER VIEW_VERSION
 #elif defined(VMX86_INTEGRITY)
 #  define PRODUCT_VERSION_NUMBER INTEGRITY_VERSION
-// VMX86_DESKTOP must be last because it is the default and is always defined.
+#elif defined(VMX86_VGAUTH)
+#  define PRODUCT_VERSION_NUMBER VGAUTH_VERSION
+ // VMX86_DESKTOP must be last because it is the default and is always defined.
 #elif defined(VMX86_DESKTOP)
 #  if defined(__APPLE__)
 #    define PRODUCT_VERSION_NUMBER FUSION_VERSION