From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 17 Sep 2018 23:41:17 +0000 (-0700)
Subject: Changes to common header files not directly applicable to open-vm-tools
X-Git-Tag: stable-10.3.5~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c34a86b232a9904941f825ce8b16320cadaace1;p=thirdparty%2Fopen-vm-tools.git

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

VGAuth Windows: fix file properties product version and file version

Product name of the VGAuth binaries are set to VMware Workstation and
the Product version set to experimental (e.x.p).

Experimental version has the e.x.p build number in the Product Version
field of each of the shipped binaries. Now that we are WHQL signing a DLL too
for security it does make sense for the feature to use an official version.

This changes the Product name and version fields from
Product name -> VMware Workstation
Product version -> e.x.p build-4013326

to
Product name -> VMware Guest Authentication
Product version -> 1.0.0 build-4013326
---

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index d9ef05ec1..372ab7580 100644
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -78,6 +78,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)
@@ -221,6 +222,8 @@
 # define PRODUCT_SHORT_NAME PRODUCT_GANTRY_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 231c4e511..1160bfcb2 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -260,7 +260,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"
@@ -355,7 +355,9 @@
 #  define PRODUCT_VERSION_NUMBER ESX_VERSION
 #elif defined(VMX86_HORIZON_VIEW)
 #  define PRODUCT_VERSION_NUMBER VIEW_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