Merge ~paelzer/ubuntu/+source/open-vm-tools:lp-1813944-backport-10.3.5-bionic into ubuntu/+source/open-vm-tools:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This looks like a vast merge due to the fact that this is actually an intentional MRE backport.
I filed the MP against bionic-devel to be correct, but while that is the content that is new to bionic it isn't really the content that is new to the Archive.

Instead for review please compare against pkg/import/2%10.3.5-4 which is the current pkg/ubuntu/disco-devel

PPA is available at [1] and testing will mostly be done by VMWare as usually.

[1]: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3617

[Andreas Hasenack (ahasenack)]

+1

I verified that the existing fixes in the current cosmic package are applied here as well, either from debian, or from upstream directly, and the only change from the disco package is the changelog.

review: Approve

[Andreas Hasenack (ahasenack)]

Sorry, my earlier comment was meant for the cosmic MP at https://code.launchpad.net/~paelzer/ubuntu/+source/open-vm-tools/+git/open-vm-tools/+merge/362462.

[Andreas Hasenack (ahasenack)]

For this bionic MP:

- the only difference to the cosmic MP is the changelog, so the same content is there. +1

review: Approve

[Christian Ehrhardt  (paelzer)]

Pushed the rebase to 2:10.3.5-6 as discussed on the associated bugs.
This will close bug 1814832 along all others that the backport already intended to fix.

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 72160df..dbf1a1b 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,9 +1,18 @@
+<<<<<<< ReleaseNotes.md
 open-vm-tools 10.3.0 Release Notes
 ==================================
 
 **Updated on: 12 JUL 2018**
 
 open-vm-tools | 12 JUL 2018 | Build 8931395
+=======
+open-vm-tools 10.3.5 Release Notes
+=================================
+
+**Updated on: 01 Nov 2018**
+
+open-vm-tools | 01 NOV 2018 | Build 10430147
+>>>>>>> ReleaseNotes.md
 
 Check for additions and updates to these release notes.
 
@@ -15,15 +24,21 @@ The release notes cover the following topics:
 *   [What's New](#whatsnew)
 *   [Before You Begin](#beforeyoubegin)
 *   [Internationalization](#i18n)
-*   [Compatibility Notes](#compatibility)
+*   [End of Feature Support Notice](#endoffeaturesupport)
+*   [Guest Operating System Customization Support](#guestop)
+*   [Interoperability Matrix](#interop)
 *   [Resolved Issues](#resolvedissues)
 *   [Known Issues](#knownissues)
 
 What's New
 ----------
 
+<<<<<<< ReleaseNotes.md
 *   Starting with 10.3.0, open-vm-tools builds with xmlsec1 by default (instead of building with xml-security). To revert to the old behavior and build with xml-security, use the option
     '--enable-xmlsecurity' for the ./configure command.
+=======
+*   **Resolved Issues: **There are some issues that are resolved in this release of open-vm-tools which are documented in the [Resolved Issues](#resolvedissues) section of this release notes.
+>>>>>>> ReleaseNotes.md
 
 Before You Begin
 ----------------
@@ -39,7 +54,11 @@ General guidelines: While upgrading ESXi hosts to ESXi 5.5 Update 3b or ESXi 6.0
 Internationalization
 --------------------
 
+<<<<<<< ReleaseNotes.md
 open-vm-tools 10.3.0 is available in the following languages:
+=======
+open-vm-tools 10.3.5 is available in the following languages:
+>>>>>>> ReleaseNotes.md
 
 *   English
 *   French
@@ -51,19 +70,32 @@ open-vm-tools 10.3.0 is available in the following languages:
 *   Simplified Chinese
 *   Traditional Chinese
 
-Compatibility Notes
--------------------
+End of Feature Support Notice
+-----------------------------
 
+<<<<<<< ReleaseNotes.md
 *   As of tools release 10.2.0, FreeBSD guests are supported only by open-vm-tools; support for the VM Tools binary package supplied directly by VMware has been discontinued for FreeBSD.  Binary packages for open-vm-tools 10.1.0 and later are available from FreeBSD package repositories.
+=======
+*   Support for Common Agent Framework (CAF) will be removed in the next major release of open-vm-tools.
+*   open-vm-tools 10.3.5 freezes feature support for tar tools and OSPs   
+    The tar tools (linux.iso) and OSPs shipped with open-vm-tools 10.3.5 release will continue to be supported. However, releases after open-vm-tools 10.3.5 will only include critical and security fixes and no new feature support in these types of open-vm-tools (tar tools and OSP's). It is recommended that customers use open-vm-tools for those operating systems that support open-vm-tools. For more information on different types of open-vm-tools, see [https://blogs.vmware.com/vsphere/2016/02/understanding-the-three-types-of-vm-tools.html](https://blogs.vmware.com/vsphere/2016/02/understanding-the-three-types-of-vm-tools.html)
+>>>>>>> ReleaseNotes.md
 
-### Guest Operating System Customization Support
+Guest Operating System Customization Support
+--------------------------------------------
 
 The [Guest OS Customization Support Matrix](http://partnerweb.vmware.com/programs/guestOS/guest-os-customization-matrix.pdf) provides details about the guest operating systems supported for customization.
 
 
+Interoperability Matrix
+-----------------------
+
+The [VMware Product Interoperability Matrix](http://partnerweb.vmware.com/comp_guide2/sim/interop_matrix.php) provides details about the compatibility of current and earlier versions of VMware Products. 
+
 Resolved Issues
 ---------------
 
+<<<<<<< ReleaseNotes.md
 *   **The open-vm-tools process might take a long time and consume 100% CPU of a core in a Linux OS with many IPv6 routes**
     
     Prior to open-vm-tools 10.3.0, gathering network adapter information in a Linux guest OS with many IPv6 routes was a time-consuming process with 100% use of the CPU of a core. The exported data contained only a maximum of 100 routes. IPv4 routes took precedence over IPv6, leading to data loss in reporting IPv6 routes. If there were more than 100 IPv4 routes, IPv6 routes were not reported.
@@ -75,9 +107,25 @@ Resolved Issues
     max-ipv6-routes=0  
       
     Note: If they are not manually set, or an invalid value (over 100 or less than 0) is set, 'max-ipv4-routes' and 'max-ipv6-routes' are set to 100 by default. They can be set to 0 to disable the data collection.
+=======
+*   **While running a quiesced snapshot of a Linux guest on the vSphere hosts earlier than version 6.7, open-vm-tools logs warning messages.**
+    
+    open-vm-tools logs warning messages like the following:
+    
+    \[<date> <time>\] \[ warning\] \[vmbackup\] Failed to send vmbackup event: vmbackup.eventSet req.genericManifest 0 /etc/vmware-tools/quiesce\_manifest.xml, result: Error processing event.
+    
+    \[<date> <time>\] \[ warning\] \[vmbackup\] Error trying to send VMBACKUP\_EVENT\_GENERIC\_MANIFEST
+    
+    The warning messages are logged by default or if vmsvc.level is set to warning or higher in the tools.conf file. Note that this is purely a logging issue and that quiesced snapshot still works even when these messages appear.
+    
+    This issue is fixed in this release. The warning message has been reworded for clarity and is no longer logged on every quiesced snapshot, but instead only on the first quiesced snapshot after a power on or vMotion.
     
-    This issue is resolved in this release.
+*   **CreateTemporaryFileInGuest/CreateTemporaryDirectoryInGuest returns a file path that does not exist.**
+>>>>>>> ReleaseNotes.md
     
+    When guest authentication user name is set to <domain>\\<user> and the user's profile directory does not exist in the guest file system, Win32 LoadUserProfile() creates a temporary user profile directory "C:\\Users\\TEMP" when the guest operation starts. After the guest operation completes, Win32 UnloadUserProfile() deletes this directory and the temporary file in the said directory.
+    
+<<<<<<< ReleaseNotes.md
 *   **Installation of the libvmtools package might fail the installation of VMware Tools**
     
     When the package "libvmtools0" is installed in SUSE Linux 12 and open-vm-tools is not installed, the VMware Tools installer fails. This is done to prevent an incomplete installation. Users have to uninstall both open-vm-tools and libvmtools0 packages to install VMware Tools.
@@ -88,20 +136,72 @@ Known Issues
 *   **Drag and Drop  functionality fails to work in Ubuntu**
     
     Drag and Drop functionality fails to work in Ubuntu 16.04.4 32-bit virtual machines installed using easy install. Also, failure of copy and paste functionality is observed in the same system.
+=======
+    This issue is fixed in this release. CreateTemporaryFileInGuest/CreateTemporaryDirectoryInGuest now returns "C:\\Windows\\TEMP\\xxxxxx".
+    
+*   **Excessive spikes of the Memory/Workload percentage metric, in a vRealize Operations cluster.**
+    
+    Guest statistics "Guest | Page in rate per second" provided by open-vm-tools is not properly handling 32-bit unsigned integer overflow on 32-bit Linux guests.
+    
+    This issue is fixed in this release.
+    
+*   **open-vm-tools Service running as vmusr crashes on Linux systems which are not running on the VMware platform.**
+    
+    When a user logs in to the Linux desktop UI of a Linux OS that packages open-vm-tools and is not running on the VMware platform, "/usr/bin/vmtoolsd -n vmusr" process generates a coredump.
+    
+    This issue is fixed in this release.
+
+
+FreeBSD Drivers
+---------------
+
+*   **vmxnet and vmxnet3 drivers have been removed from open-vm-tools for FreeBSD**
+
+    The vmxnet (version 1) network driver is not supported by any currently
+    supported VMware virtualization platform and has been removed for
+    FreeBSD from the open-vm-tools source.
+
+    FreeBSD has their own vmxnet3 network driver based on community source
+    and has never made use of the vmxnet3 source code or drivers from
+    VMware. The unneeded FreeBSD vmxnet3 source has been removed from open-vm-tools.
+
+
+Known Issues
+------------
+
+*   **Drag functionality fails to work in Ubuntu.**
+    
+    Drag functionality fails to work in Ubuntu 16.04.4 32-bit virtual machine installed using easy install. Also, failure of copy and paste functionality is observed in the same system.
+>>>>>>> ReleaseNotes.md
     
     Workaround:
     
     *   Add the modprobe.blacklist=vmwgfx linux kernel boot option.
     *   To gain access to larger resolutions, remove svga.guestBackedPrimaryAware = "TRUE" option from the VMX file.
 
+<<<<<<< ReleaseNotes.md
 *   **Shared Folders mount is unavailable on Linux VM**
     
     If the **Shared Folders** feature is enabled on a Linux VM while it is powered off, shared folders mount is not available upon restart.
     
     Workaround: If the VM is powered on, disable and enable the **Shared Folders** feature from the interface.
+=======
+*   **Shared Folders mount is unavailable on Linux VM.**
+    
+    If the **Shared Folders** feature is enabled on a Linux VM while it is powered off, shared folders mount is not available on restart.
+    
+    Workaround:
+    
+    If the VM is powered on, disable and enable the **Shared Folders** feature from the interface.
+>>>>>>> ReleaseNotes.md
     
     For resolving the issue permanently, edit **/etc/fstab** and add an entry to mount the Shared Folders automatically on boot.
     
     For example, add the line:
     
+<<<<<<< ReleaseNotes.md
     vmhgfs-fuse   /mnt/hgfs    fuse    defaults,allow_other    0    0
+=======
+    vmhgfs-fuse   /mnt/hgfs    fuse    defaults,allow\_other    0    0
+    
+>>>>>>> ReleaseNotes.md
diff --git a/debian/changelog b/debian/changelog
index e1d083a..f5ea760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 open-vm-tools (2:10.3.0-0ubuntu1~18.04.3) bionic; urgency=medium
 
   * d/p/lp-1793219-fix-stats-overflow.patch: fix potential overflow of 32 bit
@@ -31,6 +32,102 @@ open-vm-tools (2:10.3.0-0ubuntu1~18.04.1) bionic; urgency=medium
       added upstream)
 
  -- Christian Ehrhardt <[e-mail]>  Wed, 01 Aug 2018 08:16:10 +0200
+=======
+open-vm-tools (2:10.3.5-6~ubuntu0.18.04.1) bionic; urgency=medium
+
+  * Backport recent open-vm-tools (LP: #1813944)
+    - also adresses handling of quiesced snapshot failures (LP: #1814832)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 12 Feb 2019 09:55:41 +0100
+
+open-vm-tools (2:10.3.5-6) unstable; urgency=medium
+
+  * [43ec618] Correct and/or improve handling of certain quiesced
+    snapshot failures.
+    Thanks to Oliver Kurth (Closes: #921470)
+
+ -- Bernd Zeimetz <[e-mail]>  Mon, 11 Feb 2019 14:58:28 +0100
+
+open-vm-tools (2:10.3.5-5) unstable; urgency=medium
+
+  * [54cce3e] Start vmtoolsd after apparmor.service.
+    Github issue #17
+
+ -- Bernd Zeimetz <[e-mail]>  Thu, 31 Jan 2019 13:13:06 +0100
+
+open-vm-tools (2:10.3.5-4) unstable; urgency=medium
+
+  [ Alf Gaida ]
+  * [e13792d] udevadm trigger should not fail (Closes: #917642)
+
+ -- Bernd Zeimetz <[e-mail]>  Sat, 29 Dec 2018 23:00:37 +0100
+
+open-vm-tools (2:10.3.5-3) unstable; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * [d3d4703] Start vgauth before vmtoolsd.
+    VGAuthService needs to be ready when vmtoolsd runs. Certain cases - e.g.
+    Site Recovery Manager failover - will need vgauth to be up.
+    Therefore add an After=vgauth.service dependency to open-vm-tools.service
+    To have vgauth be able start early - and not pull cloud-init back late - it
+    is also required to drop default dependencies which according to VMware is
+    fine to do so.
+    (LP: #1804287)
+
+ -- Bernd Zeimetz <[e-mail]>  Fri, 14 Dec 2018 09:55:04 +0100
+
+open-vm-tools (2:10.3.5-2) unstable; urgency=medium
+
+  [ Raphaël Hertzog ]
+  * [db2a364] Ensure vmwgfx module is loaded before start of vmtoolsd.
+    This avoids a failure to start the resolutionKMS plugin and it's
+    achieved through a drop-in snippet extending open-vm-tools.service
+    adding an ExecStartPre directive loading the module prior to
+    the start of the service. (Closes: #915031)
+
+  [ Christian Ehrhardt ]
+  * [e6e0ab8] d/rules: fix dangling symlink of vmware-user.
+    Back in 2:9.4.0-1280544-6 vmware-user* was moved to the
+    open-vm-tools-desktop package and some follow on fixes moved bits that
+    were forgotten like the man page.
+    (LP: #1807441)
+    There still is a symlink in /usr/bin/vmware-user that is forgotten in
+    the base package and broken unless open-vm-tools-desktop is installed.
+    Change d/rules to move the symlink as well.
+    Signed-off-by: Christian Ehrhardt <[e-mail]>
+  * [13d22e5] Breaks and Replaces for moving vmware-user.
+    Signed-off-by: Christian Ehrhardt <[e-mail]>
+  * [d56826a] Bump breaks and replaces to next version to be released.
+    Signed-off-by: Christian Ehrhardt <[e-mail]>
+
+  [ Bernd Zeimetz ]
+  * [e4697c7] Fix race condition between open-vm-tools and systemd-tmpfiles-setup.
+    Thanks to Jean-Louis Dupond (Closes: #914910)
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 11 Dec 2018 20:40:48 +0100
+
+open-vm-tools (2:10.3.5-1) unstable; urgency=medium
+
+  * [7061cb7] Update upstream source from tag 'upstream/10.3.5'
+    Update to upstream version '10.3.5'
+    with Debian dir 9315f58cab8ba1356c1e4aa77d714257dc0651f2
+
+ -- Bernd Zeimetz <[e-mail]>  Fri, 09 Nov 2018 11:32:15 +0100
+
+open-vm-tools (2:10.3.0-1) unstable; urgency=medium
+
+  * [16acbc3] Remove PrivateTmp=yes.
+    Thanks to Christian Ehrhardt (Closes: #905170)
+  * [72aabb2] Add RequiresMountsFor=/tmp.
+    Thanks to Christopher Odenbach (Closes: #900566)
+  * [96bf0c5] Update upstream source from tag 'upstream/10.3.0'
+    Update to upstream version '10.3.0'
+    with Debian dir ace0137b2d17e039ddac188fdcd15f882119925a
+  * [e5a9b82] Re-add .travis.yml
+  * [83e043f] Refreshing patches
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 07 Aug 2018 23:41:00 +0200
+>>>>>>> debian/changelog
 
 open-vm-tools (2:10.2.5-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 15b060b..97cbecc 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Architecture: amd64 i386
 Depends: ${misc:Depends}, ${shlibs:Depends}, pciutils, iproute2
 Recommends: ethtool, zerofree, fuse, lsb-release
 Suggests: open-vm-tools-desktop, cloud-init
-Breaks: open-vm-tools-desktop (<< 2:10.0.7-3227872-2~)
+Breaks: open-vm-tools-desktop (<< 2:10.3.5-2~)
 Replaces: open-vm-tools-desktop (<< 2:10.0.7-3227872-2~)
 Description: Open VMware Tools for virtual machines hosted on VMware (CLI)
  The Open Virtual Machine Tools (open-vm-tools) project is an open source
@@ -38,8 +38,8 @@ Architecture: amd64 i386
 Depends: ${misc:Depends}, ${shlibs:Depends},
  open-vm-tools (= ${binary:Version}),
  fuse
-Breaks: open-vm-tools (<< 2:10.0.0~)
-Replaces: open-vm-tools (<< 2:10.0.0~)
+Breaks: open-vm-tools (<< 2:10.3.5-2~)
+Replaces: open-vm-tools (<< 2:10.3.5-2~)
 Recommends:
  xauth, xserver-xorg-input-vmmouse,
  xserver-xorg-video-vmware
diff --git a/debian/desktop.conf b/debian/desktop.conf
new file mode 100644
index 0000000..6456fd7
--- /dev/null
+++ b/debian/desktop.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=-/sbin/modprobe vmwgfx
diff --git a/debian/open-vm-tools.postinst b/debian/open-vm-tools.postinst
index 3f2db5e..f181ab2 100644
--- a/debian/open-vm-tools.postinst
+++ b/debian/open-vm-tools.postinst
@@ -5,7 +5,7 @@ set -e
 case "${1}" in
     configure)
         if which udevadm 1>/dev/null; then
-            udevadm trigger
+            udevadm trigger || true
         fi
         ;;
 
diff --git a/debian/open-vm-tools.service b/debian/open-vm-tools.service
index a988f08..2aa29f8 100644
--- a/debian/open-vm-tools.service
+++ b/debian/open-vm-tools.service
@@ -4,6 +4,10 @@ Documentation=http://open-vm-tools.sourceforge.net/about.php
 ConditionVirtualization=vmware
 DefaultDependencies=no
 Before=cloud-init-local.service
+After=vgauth.service
+After=apparmor.service
+RequiresMountsFor=/tmp
+After=systemd-remount-fs.service systemd-tmpfiles-setup.service
 
 [Service]
 ExecStart=/usr/bin/vmtoolsd
diff --git a/debian/open-vm-tools.vgauth.service b/debian/open-vm-tools.vgauth.service
index 94f7c89..af538a6 100644
--- a/debian/open-vm-tools.vgauth.service
+++ b/debian/open-vm-tools.vgauth.service
@@ -2,6 +2,7 @@
 Description=Authentication service for virtual machines hosted on VMware
 Documentation=http://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
+DefaultDependencies=no
 PartOf=open-vm-tools.service
 
 [Service]
diff --git a/debian/patches/debian/enable_vmhgfs-fuse_by_default b/debian/patches/debian/enable_vmhgfs-fuse_by_default
index ab0c3fd..d5aef26 100644
--- a/debian/patches/debian/enable_vmhgfs-fuse_by_default
+++ b/debian/patches/debian/enable_vmhgfs-fuse_by_default
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/debian/enable_vmhgfs-fuse_by_default
 --- a/open-vm-tools/vmhgfs-fuse/config.c
 +++ b/open-vm-tools/vmhgfs-fuse/config.c
 @@ -349,11 +349,13 @@ SysCompatCheck(char *prog_name)  // IN
@@ -14,3 +15,5 @@
  
     if (!SysCompatIsRegisteredFuse()) {
        /* Check if FUSE is installed but not loaded yet. */
+=======
+>>>>>>> debian/patches/debian/enable_vmhgfs-fuse_by_default
diff --git a/debian/patches/series b/debian/patches/series
index 12cba39..b00be19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,9 @@
 debian/pam-use-common-auth-account
 debian/max_nic_count
-debian/enable_vmhgfs-fuse_by_default
 debian/scsi-udev-rule
+<<<<<<< debian/patches/series
 ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch
 lp-1793219-fix-stats-overflow.patch
+=======
+stable-10.3.5-quiesced-snapshot
+>>>>>>> debian/patches/series
diff --git a/debian/patches/stable-10.3.5-quiesced-snapshot b/debian/patches/stable-10.3.5-quiesced-snapshot
new file mode 100644
index 0000000..93d1670
--- /dev/null
+++ b/debian/patches/stable-10.3.5-quiesced-snapshot
@@ -0,0 +1,631 @@
+--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
++++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+@@ -201,17 +201,19 @@ VmBackupPrivSendMsg(gchar *msg,
+  * Sends a command to the VMX asking it to update VMDB about a new backup event.
+  * This will restart the keep-alive timer.
+  *
++ * As the name implies, does not abort the quiesce operation on failure.
++ *
+  * @param[in]  event    The event to set.
+  * @param[in]  code     Error code.
+- * @param[in]  dest     Error description.
++ * @param[in]  desc     Error description.
+  *
+  * @return TRUE on success.
+  */
+ 
+ Bool
+-VmBackup_SendEvent(const char *event,
+-                   const uint32 code,
+-                   const char *desc)
++VmBackup_SendEventNoAbort(const char *event,
++                          const uint32 code,
++                          const char *desc)
+ {
+    Bool success;
+    char *result = NULL;
+@@ -224,6 +226,7 @@ VmBackup_SendEvent(const char *event,
+    if (gBackupState->keepAlive != NULL) {
+       g_source_destroy(gBackupState->keepAlive);
+       g_source_unref(gBackupState->keepAlive);
++      gBackupState->keepAlive = NULL;
+    }
+ 
+    msg = g_strdup_printf(VMBACKUP_PROTOCOL_EVENT_SET" %s %u %s",
+@@ -267,19 +270,52 @@ VmBackup_SendEvent(const char *event,
+                              &result, &resultLen);
+ #endif
+ 
+-   if (!success) {
++   if (success) {
++      ASSERT(gBackupState->keepAlive == NULL);
++      gBackupState->keepAlive =
++         g_timeout_source_new(VMBACKUP_KEEP_ALIVE_PERIOD / 2);
++      VMTOOLSAPP_ATTACH_SOURCE(gBackupState->ctx,
++                               gBackupState->keepAlive,
++                               VmBackupKeepAliveCallback,
++                               NULL,
++                               NULL);
++   } else {
+       g_warning("Failed to send vmbackup event: %s, result: %s.\n",
+                 msg, result);
+    }
+    vm_free(result);
+    g_free(msg);
+ 
+-   gBackupState->keepAlive = g_timeout_source_new(VMBACKUP_KEEP_ALIVE_PERIOD / 2);
+-   VMTOOLSAPP_ATTACH_SOURCE(gBackupState->ctx,
+-                            gBackupState->keepAlive,
+-                            VmBackupKeepAliveCallback,
+-                            NULL,
+-                            NULL);
++   return success;
++}
++
++
++/**
++ * Sends a command to the VMX asking it to update VMDB about a new backup event.
++ * This will restart the keep-alive timer.
++ *
++ * Aborts the quiesce operation on RPC failure.
++ *
++ * @param[in]  event    The event to set.
++ * @param[in]  code     Error code.
++ * @param[in]  desc     Error description.
++ *
++ * @return TRUE on success.
++ */
++
++Bool
++VmBackup_SendEvent(const char *event,
++                   const uint32 code,
++                   const char *desc)
++{
++   Bool success = VmBackup_SendEventNoAbort(event, code, desc);
++
++   if (!success  && gBackupState->rpcState != VMBACKUP_RPC_STATE_IGNORE) {
++      g_debug("Changing rpcState from %d to %d\n",
++              gBackupState->rpcState, VMBACKUP_RPC_STATE_ERROR);
++      gBackupState->rpcState = VMBACKUP_RPC_STATE_ERROR;
++   }
++
+    return success;
+ }
+ 
+@@ -440,6 +476,12 @@ VmBackupDoAbort(void)
+ {
+    g_debug("*** %s\n", __FUNCTION__);
+    ASSERT(gBackupState != NULL);
++
++   /*
++    * Once we abort the operation, we don't care about RPC state.
++    */
++   gBackupState->rpcState = VMBACKUP_RPC_STATE_IGNORE;
++
+    if (gBackupState->machineState != VMBACKUP_MSTATE_SCRIPT_ERROR &&
+        gBackupState->machineState != VMBACKUP_MSTATE_SYNC_ERROR) {
+       const char *eventMsg = "Quiesce aborted.";
+@@ -453,12 +495,13 @@ VmBackupDoAbort(void)
+       g_static_mutex_unlock(&gBackupState->opLock);
+ 
+ #ifdef __linux__
+-      /* Thaw the guest if already quiesced */
++      /* If quiescing has been completed, then undo it.  */
+       if (gBackupState->machineState == VMBACKUP_MSTATE_SYNC_FREEZE) {
+-         g_debug("Guest already quiesced, thawing for abort\n");
+-         if (!gBackupState->provider->snapshotDone(gBackupState,
++         g_debug("Aborting with file system already quiesced, undo quiescing "
++                 "operation.\n");
++         if (!gBackupState->provider->undo(gBackupState,
+                                       gBackupState->provider->clientData)) {
+-            g_debug("Thaw during abort failed\n");
++            g_debug("Quiescing undo failed.\n");
+             eventMsg = "Quiesce could not be aborted.";
+          }
+       }
+@@ -622,6 +665,17 @@ VmBackupAsyncCallback(void *clientData)
+       if (opPending) {
+          goto exit;
+       }
++
++      /*
++       * VMX state might have changed when we were processing
++       * currentOp. This is usually detected by failures in
++       * sending backup event to the host.
++       */
++      if (gBackupState->rpcState == VMBACKUP_RPC_STATE_ERROR) {
++         g_warning("Aborting backup operation due to RPC errors.");
++         VmBackupDoAbort();
++         goto exit;
++      }
+    }
+ 
+    switch (gBackupState->machineState) {
+@@ -957,6 +1011,7 @@ VmBackupStartCommon(RpcInData *data,
+    gBackupState->enableNullDriver = VMBACKUP_CONFIG_GET_BOOL(ctx->config,
+                                                              "enableNullDriver",
+                                                              TRUE);
++   gBackupState->rpcState = VMBACKUP_RPC_STATE_NORMAL;
+ 
+    g_debug("Using quiesceApps = %d, quiesceFS = %d, allowHWProvider = %d,"
+            " execScripts = %d, scriptArg = %s, timeout = %u,"
+@@ -1333,7 +1388,7 @@ VmBackupDumpState(gpointer src,
+ 
+ 
+ /**
+- * Reset callback.
++ * Reset callback.  Currently does nothing.
+  *
+  * @param[in]  src      The source object.  Unused.
+  * @param[in]  ctx      Unused.
+@@ -1345,7 +1400,7 @@ VmBackupReset(gpointer src,
+               ToolsAppCtx *ctx,
+               gpointer data)
+ {
+-   VmBackup_SyncDriverReset();
++
+ }
+ 
+ 
+--- a/open-vm-tools/services/plugins/vmbackup/syncDriverOps.c
++++ b/open-vm-tools/services/plugins/vmbackup/syncDriverOps.c
+@@ -35,16 +35,53 @@
+ #include <process.h>
+ #endif
+ 
++/*
++ * Define an enumeration type VmBackupOpType and a corresponding array
++ * VmBackupOpName whose entries provide the printable names of the
++ * enumeration ids in VmBackupOpType.
++ *
++ * VmBackupOpType and VmBackupOpName are each defined as an invocation
++ * of a macro VMBACKUP_OPLIST.  VMBACKUP_OPLIST specifies a list of
++ * enumeration ids using a macro VMBACKUP_OP that must be defined before
++ * invoking VMBACKUP_OPLIST.  VMBACKUP_OP takes a single argument, which
++ * should be an enumeration id, and is defined to generate from the id
++ * either the id itself or a string to be used as its printable name.  The
++ * result is that an invocation of VMBACKUP_OPLIST generates either the
++ * list of enumeration ids or the list of their printable names.
++ */
++#define VMBACKUP_OPLIST         \
++    VMBACKUP_OP(OP_FREEZE),     \
++    VMBACKUP_OP(OP_THAW),       \
++    VMBACKUP_OP(OP_UNDO),
++
++#define VMBACKUP_OPID(id)       id
++#define VMBACKUP_OPNAME(id)     #id
++
++#undef VMBACKUP_OP
++#define VMBACKUP_OP(id)       VMBACKUP_OPID(id)
++
++typedef enum {
++   VMBACKUP_OPLIST
++} VmBackupOpType;
++
++#undef VMBACKUP_OP
++#define VMBACKUP_OP(id)       VMBACKUP_OPNAME(id)
++
++static const char *VmBackupOpName[] = {
++   VMBACKUP_OPLIST
++};
++
++#undef VMBACKUP_OP
++
+ typedef struct VmBackupDriverOp {
+    VmBackupOp callbacks;
+    const char *volumes;
+-   Bool freeze;
++   VmBackupOpType opType;
+    Bool canceled;
+    SyncDriverHandle *syncHandle;
+    SyncManifest *manifest;
+ } VmBackupDriverOp;
+ 
+-
+ /*
+  *-----------------------------------------------------------------------------
+  *
+@@ -97,7 +134,7 @@ VmBackupDriverOpQuery(VmBackupOp *_op) /
+    VmBackupDriverOp *op = (VmBackupDriverOp *) _op;
+    VmBackupOpStatus ret;
+ 
+-   if (op->freeze) {
++   if (op->opType == OP_FREEZE) {
+       SyncDriverStatus st = SyncDriver_QueryStatus(*op->syncHandle, 0);
+ 
+       g_debug("SyncDriver status: %d\n", st);
+@@ -208,7 +245,7 @@ VmBackupDriverOpCancel(VmBackupOp *_op)
+ 
+ static VmBackupDriverOp *
+ VmBackupNewDriverOp(VmBackupState *state,       // IN
+-                    Bool freeze,                // IN
++                    VmBackupOpType opType,      // IN
+                     SyncDriverHandle *handle,   // IN
+                     const char *volumes,        // IN
+                     Bool useNullDriverPrefs)    // IN
+@@ -216,8 +253,9 @@ VmBackupNewDriverOp(VmBackupState *state
+    Bool success;
+    VmBackupDriverOp *op = NULL;
+ 
+-   g_return_val_if_fail((handle == NULL || *handle == SYNCDRIVER_INVALID_HANDLE) ||
+-                        !freeze,
++   g_return_val_if_fail((handle == NULL ||
++                         *handle == SYNCDRIVER_INVALID_HANDLE) ||
++                        opType != OP_FREEZE,
+                         NULL);
+ 
+    op = Util_SafeMalloc(sizeof *op);
+@@ -226,24 +264,32 @@ VmBackupNewDriverOp(VmBackupState *state
+    op->callbacks.queryFn = VmBackupDriverOpQuery;
+    op->callbacks.cancelFn = VmBackupDriverOpCancel;
+    op->callbacks.releaseFn = VmBackupDriverOpRelease;
+-   op->freeze = freeze;
++   op->opType = opType;
+    op->volumes = volumes;
+ 
+    op->syncHandle = g_new0(SyncDriverHandle, 1);
+    *op->syncHandle = (handle != NULL) ? *handle : SYNCDRIVER_INVALID_HANDLE;
+ 
+-   if (freeze) {
+-      success = SyncDriver_Freeze(op->volumes,
+-                                  useNullDriverPrefs ?
+-                                  state->enableNullDriver : FALSE,
+-                                  op->syncHandle,
+-                                  state->excludedFileSystems);
+-   } else {
+-      op->manifest = SyncNewManifest(state, *op->syncHandle);
+-      success = VmBackupDriverThaw(op->syncHandle);
++   switch (opType) {
++      case OP_FREEZE:
++         success = SyncDriver_Freeze(op->volumes,
++                                     useNullDriverPrefs ?
++                                        state->enableNullDriver : FALSE,
++                                     op->syncHandle,
++                                     state->excludedFileSystems);
++         break;
++      case OP_THAW:
++         op->manifest = SyncNewManifest(state, *op->syncHandle);
++         success = VmBackupDriverThaw(op->syncHandle);
++         break;
++      default:
++         ASSERT(opType == OP_UNDO);
++         success = VmBackupDriverThaw(op->syncHandle);
++         break;
+    }
+    if (!success) {
+-      g_warning("Error %s filesystems.", freeze ? "freezing" : "thawing");
++      g_warning("Error trying to perform %s on filesystems.",
++                VmBackupOpName[opType]);
+       g_free(op->syncHandle);
+       SyncManifestRelease(op->manifest);
+       free(op);
+@@ -329,7 +375,7 @@ VmBackupSyncDriverStart(VmBackupState *s
+    VmBackupDriverOp *op;
+ 
+    g_debug("*** %s\n", __FUNCTION__);
+-   op = VmBackupNewDriverOp(state, TRUE, NULL, state->volumes, TRUE);
++   op = VmBackupNewDriverOp(state, OP_FREEZE, NULL, state->volumes, TRUE);
+ 
+    if (op != NULL) {
+       state->clientData = op->syncHandle;
+@@ -366,7 +412,7 @@ VmBackupSyncDriverOnlyStart(VmBackupStat
+    VmBackupDriverOp *op;
+ 
+    g_debug("*** %s\n", __FUNCTION__);
+-   op = VmBackupNewDriverOp(state, TRUE, NULL, state->volumes, FALSE);
++   op = VmBackupNewDriverOp(state, OP_FREEZE, NULL, state->volumes, FALSE);
+ 
+    if (op != NULL) {
+       state->clientData = op->syncHandle;
+@@ -404,7 +450,7 @@ VmBackupSyncDriverStart(ToolsAppCtx *ctx
+    VmBackupState *state = (VmBackupState*) clientData;
+ 
+    g_debug("*** %s\n", __FUNCTION__);
+-   op = VmBackupNewDriverOp(state, TRUE, NULL, state->volumes, TRUE);
++   op = VmBackupNewDriverOp(state, OP_FREEZE, NULL, state->volumes, TRUE);
+ 
+    if (op != NULL) {
+       state->clientData = op->syncHandle;
+@@ -442,7 +488,7 @@ VmBackupSyncDriverOnlyStart(ToolsAppCtx
+    VmBackupState *state = (VmBackupState*) clientData;
+ 
+    g_debug("*** %s\n", __FUNCTION__);
+-   op = VmBackupNewDriverOp(state, TRUE, NULL, state->volumes, FALSE);
++   op = VmBackupNewDriverOp(state, OP_FREEZE, NULL, state->volumes, FALSE);
+ 
+    if (op != NULL) {
+       state->clientData = op->syncHandle;
+@@ -480,7 +526,7 @@ VmBackupSyncDriverSnapshotDone(VmBackupS
+ 
+    g_debug("*** %s\n", __FUNCTION__);
+ 
+-   op = VmBackupNewDriverOp(state, FALSE, state->clientData, NULL, TRUE);
++   op = VmBackupNewDriverOp(state, OP_THAW, state->clientData, NULL, TRUE);
+    g_free(state->clientData);
+    state->clientData = NULL;
+ 
+@@ -513,7 +559,40 @@ VmBackupSyncDriverOnlySnapshotDone(VmBac
+ 
+    g_debug("*** %s\n", __FUNCTION__);
+ 
+-   op = VmBackupNewDriverOp(state, FALSE, state->clientData, NULL, FALSE);
++   op = VmBackupNewDriverOp(state, OP_THAW, state->clientData, NULL, FALSE);
++   g_free(state->clientData);
++   state->clientData = NULL;
++
++   return VmBackup_SetCurrentOp(state, (VmBackupOp *) op, NULL, __FUNCTION__);
++}
++
++
++#if defined(__linux__)
++/*
++ *-----------------------------------------------------------------------------
++ *
++ *  VmBackupSyncDriverUndo --
++ *
++ *    Undo a completed quiescing operation.
++ *
++ * Result
++ *    TRUE, unless an error occurs.
++ *
++ * Side effects:
++ *    None.
++ *
++ *-----------------------------------------------------------------------------
++ */
++
++static Bool
++VmBackupSyncDriverUndo(VmBackupState *state,
++                       void *clientData)
++{
++   VmBackupDriverOp *op;
++
++   g_debug("*** %s\n", __FUNCTION__);
++
++   op = VmBackupNewDriverOp(state, OP_UNDO, state->clientData, NULL, TRUE);
+    g_free(state->clientData);
+    state->clientData = NULL;
+ 
+@@ -524,6 +603,39 @@ VmBackupSyncDriverOnlySnapshotDone(VmBac
+ /*
+  *-----------------------------------------------------------------------------
+  *
++ *  VmBackupSyncDriverOnlyUndo --
++ *
++ *    Undo a completed quiescing operation.
++ *
++ * Result
++ *    TRUE, unless an error occurs.
++ *
++ * Side effects:
++ *    None.
++ *
++ *-----------------------------------------------------------------------------
++ */
++
++static Bool
++VmBackupSyncDriverOnlyUndo(VmBackupState *state,
++                           void *clientData)
++{
++   VmBackupDriverOp *op;
++
++   g_debug("*** %s\n", __FUNCTION__);
++
++   op = VmBackupNewDriverOp(state, OP_UNDO, state->clientData, NULL, FALSE);
++   g_free(state->clientData);
++   state->clientData = NULL;
++
++   return VmBackup_SetCurrentOp(state, (VmBackupOp *) op, NULL, __FUNCTION__);
++}
++#endif
++
++
++/*
++ *-----------------------------------------------------------------------------
++ *
+  *  VmBackupSyncDriverRelease --
+  *
+  *    Frees the given pointer.
+@@ -579,10 +691,17 @@ VmBackup_NewSyncDriverProviderInternal(B
+    if (useNullDriverPrefs) {
+       provider->start = VmBackupSyncDriverStart;
+       provider->snapshotDone = VmBackupSyncDriverSnapshotDone;
++#if defined(__linux__)
++      provider->undo = VmBackupSyncDriverUndo;
++#endif
+    } else {
+       provider->start = VmBackupSyncDriverOnlyStart;
+       provider->snapshotDone = VmBackupSyncDriverOnlySnapshotDone;
++#if defined(__linux__)
++      provider->undo = VmBackupSyncDriverOnlyUndo;
++#endif
+    }
++
+    provider->release = VmBackupSyncDriverRelease;
+    provider->clientData = NULL;
+ 
+@@ -642,26 +761,3 @@ VmBackup_NewSyncDriverOnlyProvider(void)
+ }
+ 
+ #endif
+-
+-
+-/*
+- *-----------------------------------------------------------------------------
+- *
+- * VmBackup_SyncDriverReset --
+- *
+- *    Reset function
+- *
+- * Results:
+- *    None.
+- *
+- * Side effects:
+- *    Whatever are the side effects of what it calls.
+- *
+- *-----------------------------------------------------------------------------
+- */
+-
+-void
+-VmBackup_SyncDriverReset(void)
+-{
+-   SyncManifestReset();
+-}
+--- a/open-vm-tools/services/plugins/vmbackup/syncManifest.c
++++ b/open-vm-tools/services/plugins/vmbackup/syncManifest.c
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2017-2018 VMware, Inc. All rights reserved.
++ * Copyright (C) 2017-2019 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -27,6 +27,7 @@
+ #include "syncDriver.h"
+ #include "syncManifest.h"
+ #include "vm_tools_version.h"
++#include "vmware/tools/log.h"
+ 
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -49,12 +50,6 @@ static const char syncManifestFmt[] = {
+  */
+ static const char syncManifestSwitch[] = "enableXmlManifest";
+ 
+-/*
+- * If TRUE, indicates that VMTools should try to generate the backup
+- * manifest and send it to VMX; if FALSE, it won't try to do so.
+- */
+-static Bool gSyncManifestTrySend = TRUE;
+-
+ 
+ /*
+  *-----------------------------------------------------------------------------
+@@ -95,12 +90,6 @@ SyncNewManifest(VmBackupState *state,
+       return NULL;
+    }
+ 
+-   if (!gSyncManifestTrySend) {
+-      g_debug("No backup manifest generated since previous"
+-              " attempt to send one to host failed.\n");
+-      return NULL;
+-   }
+-
+    manifest = g_new0(SyncManifest, 1);
+    manifest->path = g_strdup_printf("%s/%s", state->configDir,
+                                     syncManifestName);
+@@ -173,37 +162,14 @@ SyncManifestSend(SyncManifest *manifest)
+       return FALSE;
+    }
+ 
+-   if (!VmBackup_SendEvent(VMBACKUP_EVENT_GENERIC_MANIFEST,
+-                           VMBACKUP_SUCCESS, manifest->path)) {
+-      g_warning("Host doesn't appear to support backup manifests "
+-                "for Linux guests.\n");
+-      gSyncManifestTrySend = FALSE;
++   if (!VmBackup_SendEventNoAbort(VMBACKUP_EVENT_GENERIC_MANIFEST,
++                                  VMBACKUP_SUCCESS, manifest->path)) {
++      /* VmBackup_SendEventNoAbort logs the error */
++      g_info("Non-fatal error occurred while sending %s, continuing "
++             "with the operation", VMBACKUP_EVENT_GENERIC_MANIFEST);
+       return FALSE;
+    }
+ 
+    g_debug("Backup manifest was sent successfully.\n");
+    return TRUE;
+ }
+-
+-
+-/*
+- *-----------------------------------------------------------------------------
+- *
+- * SyncManifestReset --
+- *
+- *    Reset SyncManifest global state
+- *
+- * Results:
+- *    None
+- *
+- * Side effects:
+- *    None
+- *
+- *-----------------------------------------------------------------------------
+- */
+-
+-void
+-SyncManifestReset(void)
+-{
+-   gSyncManifestTrySend = TRUE;
+-}
+--- a/open-vm-tools/services/plugins/vmbackup/syncManifest.h
++++ b/open-vm-tools/services/plugins/vmbackup/syncManifest.h
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2017-2018 VMware, Inc. All rights reserved.
++ * Copyright (C) 2017-2019 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -45,9 +45,6 @@ SyncManifestSend(SyncManifest *manifest)
+ void
+ SyncManifestRelease(SyncManifest *manifest);
+ 
+-void
+-SyncManifestReset(void);
+-
+ #else /* !defined(__linux__) */
+ 
+ typedef void SyncManifest;
+@@ -55,7 +52,6 @@ typedef void SyncManifest;
+ #define SyncNewManifest(s, h)            (NULL)
+ #define SyncManifestSend(m)              (TRUE)
+ #define SyncManifestRelease(m)           ASSERT(m == NULL)
+-#define SyncManifestReset()
+ 
+ #endif /* defined(__linux__) */
+ 
+--- a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
++++ b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
+@@ -72,6 +72,12 @@ typedef enum {
+    VMBACKUP_MSTATE_SYNC_ERROR
+ } VmBackupMState;
+ 
++typedef enum {
++   VMBACKUP_RPC_STATE_NORMAL,
++   VMBACKUP_RPC_STATE_ERROR,
++   VMBACKUP_RPC_STATE_IGNORE
++} VmBackupRpcState;
++
+ /**
+  * This is a "base struct" for asynchronous operations monitored by the
+  * state machine. Each implementation should provide these three functions
+@@ -138,6 +144,7 @@ typedef struct VmBackupState {
+    Bool           vssBootableSystemState;
+    Bool           vssPartialFileSupport;
+    Bool           vssUseDefault;
++   VmBackupRpcState rpcState;
+ } VmBackupState;
+ 
+ typedef Bool (*VmBackupCallback)(VmBackupState *);
+@@ -156,6 +163,7 @@ typedef struct VmBackupSyncProvider {
+    VmBackupProviderCallback start;
+ #else
+    ToolsCorePoolCb start;
++   VmBackupProviderCallback undo;
+ #endif
+    VmBackupProviderCallback snapshotDone;
+    void (*release)(struct VmBackupSyncProvider *);
+@@ -295,8 +303,11 @@ VmBackup_SendEvent(const char *event,
+                    const uint32 code,
+                    const char *desc);
+ 
+-void
+-VmBackup_SyncDriverReset(void);
++
++Bool
++VmBackup_SendEventNoAbort(const char *event,
++                          const uint32 code,
++                          const char *desc);
+ 
+ #endif /* _VMBACKUPINT_H_*/
+ 
diff --git a/debian/rules b/debian/rules
index 2789360..5062e63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,10 +62,14 @@ override_dh_auto_install:
 
 	mkdir -p debian/open-vm-tools-desktop/usr/bin
 	mv debian/open-vm-tools/usr/bin/vmware-user-suid-wrapper debian/open-vm-tools-desktop/usr/bin
+	mv debian/open-vm-tools/usr/bin/vmware-user debian/open-vm-tools-desktop/usr/bin
 
 	mkdir -p debian/open-vm-tools-desktop/etc/xdg/autostart
 	mv debian/open-vm-tools/etc/xdg/autostart/vmware-user.desktop debian/open-vm-tools-desktop/etc/xdg/autostart
 	rm -rf debian/open-vm-tools/etc/xdg
+	
+	mkdir -p debian/open-vm-tools-desktop/lib/systemd/system/open-vm-tools.service.d
+	cp debian/desktop.conf debian/open-vm-tools-desktop/lib/systemd/system/open-vm-tools.service.d/
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
diff --git a/open-vm-tools/ChangeLog b/open-vm-tools/ChangeLog
index 9fbd129..e7a4593 100644
--- a/open-vm-tools/ChangeLog
+++ b/open-vm-tools/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< open-vm-tools/ChangeLog
 commit a30d7aaa4d10fbce4b7d262487fffaf1dc32d949
 Author: Oliver Kurth <[e-mail]>
 Date:   Fri Jul 6 14:31:55 2018 -0700
@@ -1461,6 +1462,2793 @@ Date:   Tue Feb 6 16:32:40 2018 -0800
 commit 035765d487f8ab9b2222ad239b278e4725aa5a22
 Author: Oliver Kurth <[e-mail]>
 Date:   Tue Feb 6 16:32:39 2018 -0800
+=======
+commit 583fc02dbee4ba88a20c67a0f5e5a9b023b551ea
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Nov 6 17:14:40 2018 -0800
+
+    bump version and build number
+
+commit d51ec15038c43472e9bc48de7081b0954a122f97
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Nov 6 17:13:04 2018 -0800
+
+    sync deploypkg files
+
+commit b4b07f53c71a83beed8fdc11f2dfeeb43aa20fda
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Oct 5 13:55:27 2018 -0700
+
+    Use bitwise AND operation while fetching current IOPL.
+    
+    Iopl_Get() was using logical AND operation which could result
+    in wrong IOPL value. We should be using bitwise AND instead.
+
+commit 87593b29e5c337141be65e4430fb95a4f1741afb
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Oct 5 13:55:27 2018 -0700
+
+    Optional override for short and long OS names sent from Tools
+    
+    Added support for customers to override the returned long and short OS
+    names through the tools config file. If the setting is present, then names
+    gathered by hostinfo will be ignored. The user is responsible for setting
+    the appropriate names.
+    
+    The override will be ignored if the short-name setting is not present in
+    tools.conf.
+    
+    An empty string will be sent for the long OS name if only the short-name
+    setting is present.
+    
+    Appropriate warning msg will be generated in both cases.
+    
+    Example of the conf setting:
+    
+    [guestosinfo]
+    short-name = centos6-64
+    long-name = some long name
+
+commit b08cd0da457263f80e84ca95348c2a97cb7e22a5
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:19 2018 -0700
+
+    Hgfs Server Linux: fix the share permissions on a file rename or delete
+    
+    Coverity found that the argumeents to obtain the share permissions
+    on a file rename were swapped. Even though they are tested together
+    in an if statement which is not an issue, it could be in the future.
+    
+    Reverse arguments so the share read and write permissions are correct.
+
+commit bdde701699212ca7fb118f3a49a9bbc7fb06df68
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:18 2018 -0700
+
+    Hgfs FUSE Client: fix missing pthread_mutex_unlock call
+    
+    Fix missing pthread_mutex_unlock call in HgfsSetAttrCache when
+    updating the cached attributes on a file and a memory allocation
+    fails.
+
+commit 01376aca4d4bee5efed9b4b2597d141722a7feb5
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:18 2018 -0700
+
+    Bump up the SYSIMAGE_VERSION for VMware Tools 10.3.5
+
+commit 7fc13e2b58dc91627d4ff78fd532b77898adf2d2
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:18 2018 -0700
+
+    Update the copyright year for OVT bundled files modified since 10.3.2
+
+commit c7a186e204cdff46b5e02bcb5208ef8979eaf261
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:18 2018 -0700
+
+    Handle Linux kernel /proc FS uint32 type stat overflow when calculating
+    tools rate stats.
+    
+    On both 32-bit and 64-bit Linux, tools always parses Linux kernel /proc
+    FS stats as uint64 values.  For rate stats, current - previous can handle
+    uint64 type stat overflow, but not uint32 type.
+
+commit 064d0a3458991f0c34a397664b6b5cd8cc00e5b3
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:18 2018 -0700
+
+    nicinfo: skip loopback devices
+    
+    When libdnet isn't used, loopback devices were reported. This change
+    skips these interfaces. Also skip interfaces that are down.
+    
+    The interface was visible with vim-cmd, but not in the VC or
+    ESX UI. It did not contain any IP addresses.
+
+commit 8979f11f78ef7fdbb51afa298896e06b4d874e5b
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:18 2018 -0700
+
+    Allow only a single instance of vmusr when multiple users are logged into a VM
+    
+    When a vmusr process gets the "channel conflict" error while attempting
+    to open the toolbox-dnd channel, a channel reset is triggered.  That
+    reset results in the channel being restarted and a subsequent conflict
+    and reset occurs - every second until the channel becomes available.
+    
+    For *nix guests:
+    The fix is making use of the repetitive channel resets where the only
+    RpcIn message received is a "reset" to catch this channel "permanently"
+    unavailable state.  If other RpcIn messages are received, a channel
+    is considered to be working and the cumulative error count is cleared..
+    
+    lib/rpcin/rpcin.c:
+    - struct RpcIn: Added error status boolean and callback function to
+                    notify the dependent layer that a channel error has been
+                    resolved.
+    - RpcInLoop(): If a non "reset" message is received, clear any channel
+                   error status.  This will also notify the dependent layer
+                   that the channel is functioning.
+    - RpcIn_start(): Added additional argument for new callback; NULL if
+                     not needed.
+    
+    lib/rpcChannel/rpcChannel.c:
+    - struct rpcChannelInt:
+      - Renamed "rpcErrorCount" to "rpcResetErrorCount" since it is actually
+        a count of the consecutive channel reset failures and not a count
+        of RpcChannel errors.
+      - Added counter "rpcFailureCount" for the cumulative channel errors.
+      - Added "rpcFailureCb" for optional callback to notify the app of a
+        "permanent" channel failure.
+    - New function RpcChannelClearError() for RpcIn to notify when the
+      channel is working; to clear the rpcFailureCount .
+    - RpcChannel_Setup() - added two arguments for (1) an optional function
+                           to be called when there is a channel failure
+                           and (2) a failure count threshold.
+                           These optional values are stored in the
+                           RpcChannel structure being created.
+    - RpcChannelError(): Added logic to notify the calling app if the error
+                         threshold has been reached and notify the app if a
+                         callback was provided. A zero threshold signifies
+                         the single vmusr limit should not be enforced.
+                         (fix disable switch).
+    
+    services/vmtoolsd/mainLoop.c:
+    - New function ToolsCore_GetVmusrLimit() to retrieve the channel error
+      threshold default or over-ride from tools.conf.
+    
+    services/vmtoolsd/toolsRpc.c:
+    - Added ToolsCoreAppChannelFail(): Callback for "permanent" channel
+      connection failure.  A warning is logged based on whether another
+      "vmtoolsd -n vmusr" is running or not and the process is terminated.
+      On Mac OS, the process is terminated with exit(1) as an indication
+      to launchd that the vmusr process should not automatically be
+      restarted.
+    
+    The current implementation uses the error callback only for the vmusr
+    server on Linux (*nix).
+    The default channel error limit is 5 (approx. 5 second), but is user
+    configurable in tools.conf.
+    
+       [vmusr]
+       maxChannelAttempts = n    # where allowed n = 0, 3-15
+    
+    When "maxChannelAttempts = 0" is used, the restriction to a single
+    running vmusr process is not enforced.   The existing behavior is
+    restored with all the accompanying VMX log spew.  This is essentially
+    a user configurable feature disablement switch.
+
+commit 0c34a86b232a9904941f825ce8b16320cadaace1
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Sep 17 16:41:17 2018 -0700
+
+    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
+
+commit 5f5a7f4a0984ee35ce79d736426a5335c91da332
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:28 2018 -0700
+
+    Remove vmxnet and vmxnet3 drivers from FreeBSD builds and open-vm-tools
+    
+    The vmxnet (version 1) network driver is not supported by any currently
+    supported VMware virtualization platform. Removing the FreeBSD
+    specific vmxnet source and deleting the vmxnet.ko driver build from
+    the tools and the open-vm-tools builds.
+    
+    FreeBSD has their own vmxnet3 network driver based on community source
+    and has never made use of the vmxnet3 source code or drivers from
+    VMware.  Removing the unneeded FreeBSD vmxnet3 source and builds
+
+commit 1a413064fee53ac3e334e96c546886e60724d07a
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Update SSL configuration with more secure settings.
+    
+    Due to SSL issues in the past, The preference is to have default
+    settings to be more secure than compatible.  This change mainly
+    inherits the default settings from ssl.c.
+
+commit 450aca9f244b5e56bcef130df1a06137fd1f07e0
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Add virbr* interfaces on RHEL to the default exclude-nics.
+
+commit 5a6e8bc0ef8af2eedbbc4dc1973cb7fe18afa939
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Fix a gcc-8 compiler warning in lib/misc/vthreadBase.c
+    
+    gcc-8 generates a stringop-truncation warning when it's possible
+    for strncpy to exclude the trailing nul.  The code was fine, we never
+    touch the last byte in the buffer and it's a static, but explicitly
+    set a nul at the end of the buffer so gcc sees it.
+    
+    This is needed for open-vm-tools to build on Suse Tumbleweed.
+
+commit 5200ba3a770463e5c6a9e9d7e7a6a949857332ec
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Return proper vix error code when guest op VIX_COMMAND_DELETE_GUEST_DIRECTORY_EX fails.
+
+commit 8ffda7dbae4b916b28e3f903554bc37db1d5f974
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Make Tools logfiles readable only by owner and root
+
+commit b0e2fab2787fbc511d240c4ce0f52a74b55152fe
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Reduce quiesced snapshot warning messages when running on older hosts.
+    
+    vSphere 6.7 added a new interface on the host side that allows tools
+    to send a "generic" backup manifest during a quiesced snapshot on
+    Linux guests. VMTools 10.2.0 or later will try to send the manifest
+    file and if the host is unable to field it, then VMTools logs this
+    information and continues with the quiesced snapshot in the older
+    fashion.  This change reduces the logging that is done in this case.
+
+commit a4b4c338f1202d161e8cad2eb7cf78d44f2fd302
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Common source file change not directly applicable to open-vm-tools
+    
+    Verify existence of the returned path, retry the guest OP
+    CreateTemporaryFileInGuest/CreateTemporaryDirectoryInGuest using system
+    temp folder if the path disappears.
+
+commit b6c450d123141a752bd4805263b7d476f5b1f26b
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Fix coverity complaint; not a real bug
+
+commit 23bd37544bb9ae4069002d73cb1c1b40e221d36a
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:27 2018 -0700
+
+    Common source file change not directly applicable to open-vm-tools.
+
+commit c2dd430ea5c8c9309700d25548513469dae68c9b
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:26 2018 -0700
+
+    Disable hgfsServer plugin when not running in a VMware VM.
+    
+    VmCheck_GetVersion() accesses Backdoor in an unsafe manner
+    which is not expected to work on non-VMware environments
+    including physical machines. So, we need to make sure that
+    VmCheck_GetVersion() is called only when we are running in
+    a VMware VM.
+
+commit 31a60ab3529a8dad8d602a524d194013d90abeec
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:26 2018 -0700
+
+    Expose more guest stats for vROPS to report the exact physical memory
+    stats as the guest OS UI does.
+    
+    Windows:
+    guest.mem.modifiedPages (Win32_PerfRawData_PerfOS_Memory#ModifiedPageListBytes)
+    guest.mem.standby.core (Win32_PerfRawData_PerfOS_Memory#StandbyCacheCoreBytes)
+    guest.mem.standby.normal (Win32_PerfRawData_PerfOS_Memory#StandbyCacheNormalPriorityBytes)
+    guest.mem.standby.reserve (Win32_PerfRawData_PerfOS_Memory#StandbyCacheReserveBytes)
+    
+    Linux:
+    guest.mem.total (/proc/meminfo#MemTotal)
+    guest.mem.buffers (/proc/meminfo#Buffers)
+    guest.mem.cached (/proc/meminfo#Cached)
+    guest.mem.slabReclaim (/proc/meminfo#SReclaimable)
+    guest.mem.available (/proc/meminfo#MemAvailable since Linux 3.14, emulated by VMTools for kernels 2.6.27+)
+
+commit 0b01aefe3ee960c6035863bcf4fd7e2ff654b99b
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Sep 7 15:53:26 2018 -0700
+
+    Update the tools version to 10.3.5
+    
+    Set the tools version in vm_tools_version.h to be
+    TOOLS_VERSION_JACKHAMMER_UPDATE1 = 10.3.5.
+
+commit 2147df6aabe639fc5ff423ed791a8e7f02bf8d0a
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jul 13 11:54:23 2018 -0700
+
+    prepare for 10.3.0 release
+commit a30d7aaa4d10fbce4b7d262487fffaf1dc32d949
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jul 6 14:31:55 2018 -0700
+
+    Common source file change, not directly applicable to open-vm-tools.
+    
+    Enforce monotonic behavior for the value returned by times() on Mac.
+
+commit 12e5559e4dcf3968dd45131077b68364578f3bef
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jul 6 14:31:55 2018 -0700
+
+    Update the Tools-10.3.0 OSL.
+    
+    Update the Tools-10.3.0 open source license files.
+
+commit c80bb3fc7960bc78a6d39c89b6952218a401b0cf
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jul 6 14:31:55 2018 -0700
+
+    [tools-plugin] Potential solution for reported desktopEvent crash
+    
+    On several distros like RHEL, CentOS and Fedora, plugin desktopEvents.so
+    crashes have been reported.  However, neither development or QE can
+    reproduce this issue in local environments.
+    
+    The XFetchName document states that it may generate BadWindow error.  That
+    means that the value for a Window argument does not name a defined Window.
+    X FAQ also suggests handling badwindow error after finding it.  Since
+    the window does not exist when XFetchName is run on it, the name is not
+    needed.  Suppress this error to avoid a crash.
+    
+    After grabbing the X server, use XSetErrorHandler to temporarily define
+    a local error handler to intercept and cleanly handle any BadWindow
+    errors.  XSetErrorHandler returns the current error handler, so it is
+    straightforward to reinstate GDK's original handler.
+
+commit 6172812c021469704c51817693c6c8f6bf226509
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jul 6 14:31:55 2018 -0700
+
+    Remove the new guest metrics feature switch, permanently enabling the
+    collection of new guest metrics for vROps..
+
+commit 6e6285ec690a13ff8ba894ee463a5aa0fd034269
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:46 2018 -0700
+
+    Previous change to configure.ac and vmtools.m4 caused a regression
+    
+    Backing out of 10.3.0.
+
+commit 699cda01fab8b1ad8a1e912d650aa92f7ffdf0e6
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:46 2018 -0700
+
+    [OVT] Update copyright year to 2018 for few files.
+    
+    Updated the copyright year to 2018 for few files changed in the last
+    few days.
+
+commit cecbaf6b16f5fd1ecbfe4419310352353b047ba2
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:46 2018 -0700
+
+    open-vm-tools: use AC_CHECK_TOOL for pkg-config
+    
+    AC_CHECK_TOOL honors the --host setting to configure, and searches
+    for tools with the cross compile prefix thus allowing for cross
+    compile specific tools.
+    
+    Fixes issue #26 in github.
+
+commit f2c8d02161569c96ac452f9d1063756d133562ba
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    open-vm-tools: build dndcp with thread libs
+    
+    Recent changes in the dndcp plugin made it necessary to make sure that
+    it links against pthread libs.
+
+commit 99df5712ba7b8910c3db138c64aab6957f31c914
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    Clipboard content on the host gets loaded to tmp on Linux guest with a right click on Guest
+    
+    Root Cause:
+    Dndcp plugin creates a sub thread to monitor if there is other application
+    access the specific file.  The root cause for this bug is the main thread
+    doesn't update its field before wakeup the sub thread, this cause the sub
+    thread get a wrong value.
+    
+    Solution:
+    Main thread should update the field before wakeup the sub thread.
+
+commit 99af79200f91c246580197b5698995fba4dc47af
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    open-vm-tools: build for FreeBSD fails in fakeMouseWayland
+    
+    Root Cause:
+    In the file fakeMouseWayland.cpp, several Linux related header files
+    are included:
+      <linux/input.h>
+      <linux/ioctl.h>
+      <linux/uinput.h>
+    
+    These header files do not exist for FreeBSD and Solaris.
+    
+    Solution:
+    Lib fakeMouse is not needed by FreeBSD and Solaris, so update the makefile
+    to build the fakemouse related code only on Linux.
+
+commit 104cab14e08b93a2525992e09f0d13ff26d52d9d
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    Use "/var/run" or "/run" instead of "/tmp" in Linux guest for imc package copy
+    
+    1. check if /var/run is a directory in VM
+    2. if Yes, use /var/run/XXXXXX
+    3. check if /run is a directory in VM
+    4. if Yes, use /run/XXXXXX
+    5. if both No, use /tmp/XXXXXX as before
+
+commit 8f93d803066032a738b9d9a6990e32ed17b589e1
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    Build open-vm-tools with xmlsec1 by default.
+    
+    Build open-vm-tools with xmlsec1 by default, rather than with
+    xml-security-c as is done currently.  This requires modifications
+    to configure.ac to change the default for use_xmlsec1, plus
+    modifications to bora-vmsoft/install/Source/tools-pkg.make to
+    initialize flags for xmlsec1 and xml2 now needed by the OVT build
+    that is done during tools builds.
+    
+    Another change that surfaced during this was that the symbol that
+    configure checks for the xmlsec library was wrong.  It should be
+    xmlSecCheckVersionExt rather than xmlSecCheckVersion.  The latter
+    is a header-defined macro but not a library symbol.
+
+commit 7313fdc5b2b14ac83340b2e59752b934494c2ae9
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    [Wayland Copy & Paste] Part2: Uses VMBlock notification mechanism for Copy & Paste
+    
+    This patch is part of the new feature for Workstation 15: \[P0\] Wayland
+    support in Linux guest - Copy & Paste.
+    
+    In the first patch, the notification mechanism is added to the VMBlock module.
+    In this patch, the notification mechanism is used,
+
+commit c04b9987786901f544c4df04f7701b48ac8f6475
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    [Wayland Copy & Paste] Part1: Add notification mechanism to the VMBlock module
+    
+    This patch is part of the new feature for Workstation 15: [P0] Wayland support
+    in Linux guest - Copy & Paste.
+    
+    In the implementation of current VMTools, there is a restriction, in the first
+    second after grab into the guest, the CopyPasteUIX11::LocalGetFileRequestCB,
+    which is a callback from a file paste request from another guest application
+    and begins copying the files from host to guest and return the file list,
+    will return none directly.
+    
+    The Wayland file explorer will request the content in the clipboard after the
+    user clicks on the file explorer, and the request will get nothing since the
+    restriction in the VMTools, so the following ‘Paste’ operation will fail.
+    
+    Solution:
+    This solution is only used for the Linux guest with Wayland. The behavior
+    for Linux guest with X11 will not change.
+    
+    The restriction, the CopyPasteUIX11::LocalGetFileRequestCB returns directly
+    in the first second after grab into the guest, will be removed.
+    
+    And, the notification mechanism will be added into the VM block file system.
+    This mechanism is similar with the inotify module.
+    
+    Take the VMBlock Fuse File System as an example, currently, the mount point contains below contents:
+    
+    * /blockdir/
+    
+    * /dev
+    
+    /blockdir/ contains the symlinks to the contents of the target directory.
+    
+    /dev is the control file for VMBlock Fuse File System.
+    
+    In this new solution, a new folder /notifydir/ will be added, each file in this folder is a special file, read from this file will be blocked until any other process read from the corresponding file in target directory or the block on the target directory is removed.
+    
+    This patch only focus on the notification mechanism.
+
+commit 6c0b2130e7ee103ece06eb674c5f5dfea66c26f1
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    FreeBSD: clang compiler related changes to configure.ac
+    
+    On FreeBSD, the unwind.h header is available in the libunwind
+    package (/usr/ports/devel/libunwind) which may or may not be installed
+    on a system.  The libunwind functions to determine the call-chain in a
+    program are defined only if " __GNU_SOURCE" is defined to enable "all"
+    GCC extensions.  Avoid the unwind.h header if seen on FreeBSD.
+    
+    The "clang" compiler will issue warnings if the address of a member
+    of a packed structure is taken.  Since warnings are errors with -Wall,
+    add --Wno-address-of-packed-member to CFLAGS when compiling with
+    "clang".
+
+commit bba52bfa5b29c8860f18200022db5b8b250d326b
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:45 2018 -0700
+
+    open-vm-tools: build with tirpc
+    
+    Newer distros (Fedora, OpenSuSE Tumblweed) no longer ship rpcgen with glibc,
+    so we need to build with libtirpc (see
+    https://bugzilla.redhat.com/show_bug.cgi?id=1531540 and
+    https://bugzilla.suse.com/show_bug.cgi?id=1089181).
+    With this change, configure will check for the presence of libtirpc and
+    if found, sets flags to build with it. configure will also exit with an
+    error if rpcgen is not found.
+
+commit 5c0b9496db96af9ea5e4b3b1321f0612a3f62d99
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    Changes to build CAF with VS 2015; not applicable to open-vm-tools.
+
+commit 3961588fcce58090c249f4a65ad8cc109efecc5c
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    Log full version of Tools in vmware.log.
+    
+    Currently, only the Tools build number is logged in vmware.log.
+    It will be very handy to have the full version logged in
+    there and avoid the need to manually lookup the build.
+
+commit bf494fd02a77a4f34ff420c03c0c5a19e43218d3
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    Tools 10.3.0 L10n drop2
+    
+    This is to integrate the final L10n drop for VMware Tools 10.3.
+
+commit 065f09b94e09f1127901db29e73cc9b9f36df4fc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    Add two switches for max IPv4/6 routes to gather
+    
+    Gathering nic info in a Linux guest OS which is configured with large
+    number(60000+) of ipv6 routes could result in vmtoolsd process taking a
+    long time and rock solid 100% CPU of a core.  Though tools only exports
+    at most NICINFO_MAX_ROUTES(100) routes, it tries to read all the contents
+    of /proc/net/ipv6_route which costs too much time because:
+    1. IPv6 route table is not efficient natively compared to ipv4 due to
+       its implementation.
+    2. The g_io library can aggravate the performance.
+    
+    On the other hand, when gathering routes, IPv4 comes first, and IPv6 second.
+    And the routes reported to VMX has an overall limitation of serializing
+    (NICINFO_MAX_ROUTES).  If there's more than NICINFO_MAX_ROUTES IPv4 routes
+    in system, no IPv6 will get reported.
+    
+    Added two switches "max-ipv4-routes" and "max-ipv6-routes"
+    (NICINFO_MAX_ROUTES by default) in tools.conf and let SlashProcNet_GetRoute*()
+    only read the first max ipv4/6 routes lines of /proc/net/[ipv6_]route to avoid
+    performance problem.  Users can disable ipv4/ipv6 routes gathering
+    separately if they want ipv6 or ipv4 only.
+
+commit bf86c612a8ffe1d20b98c20b76f0c34840a7a2a3
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    Not checking symbols when building open-vm-tools
+    
+    Using a hard-coded mangled name is not a good idea because C++ does not
+    have any standard for name mangling.  Remove these mangled names introduced
+    in an earlier fix.
+
+commit d36ed6e5b4784a36cb93f50e05d6a49b5d76b86e
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    [OVT] Update copyright year to 2018 for files modified since 10.2.5 GA
+
+commit 8086ead225faf3a051952773c0b98b2c751b1e84
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:44 2018 -0700
+
+    Hgfs Win Client: fix bad illegal character escaping; not applicable to open-vm-tools.
+
+commit 7efc7b70a57cf734012a069fabab19e96f8cf16d
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:43 2018 -0700
+
+    Add the JACKHAMMER code name to the 10.3.0 release version defines.
+    
+    Adding the code name JACKHAMMER to the 10.3.x series version notation
+    for the public source release and use by future 10.3.x patches or
+    updates.
+
+commit d71381445f6c3b986e263435006428a44be0451a
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Jun 19 11:07:43 2018 -0700
+
+    Hgfs Server Plugin: only handle the shared folders client in hosted products
+    
+    Only initialize the Shared Folders client redirector in hosted product
+    environments.
+    
+    Details: Check if the tools system service started in a non-hosted product
+    and if so do not start the shared folders client redirector.
+    Check if the tools user service started in a non-hosted product product and if
+    so then skip reconnecting any Shared Folders mapped drives.
+
+commit ad7c68780a773d6d456687aff0d27f9cff808370
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu May 10 16:47:16 2018 -0700
+
+    update version number
+
+commit cac0f086ffcc00da73dd7dd80fef6956962f4dd6
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu May 10 16:38:11 2018 -0700
+
+    Remove debug display of CPUID vendor string seen in VmCheck_IsVirtualWorld
+    
+    The "Debug" message containing vendor string returned by the CPUID
+    instruction will appear on STDERR for stand-alone programs such
+    as vmware-checkvm.  This unexpected output is at best noise and may
+    adversely affect existing scripts.
+
+commit 7ddbe3c9df400dfdf7d67d259ae3942d157dedb4
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 30 15:42:54 2018 -0700
+
+    sync deploypkg files
+
+commit 80a23d71a281493071668fd45b77d7f8248fad68
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 30 14:04:14 2018 -0700
+
+    Changes to common header files:
+    - Add Amazon Linux 2 to the known guest OS list.
+    - Other change not application to open-vm-tools.
+
+commit 48dc7a57ff3fe5cb1441040876f74b69772c1ea5
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 30 14:04:13 2018 -0700
+
+    [DeployPkg] Replace Log() references with g_log()
+    
+    * Modified the code to replace a couple of Log() references with g_debug()
+    so that they are properly logged with 'deplogPkg' domain instead of the
+    generic 'vmsvc' domain in the tools log files.
+
+commit 9cb12223b4da529df043d95ab025f22c6ee00c39
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    [oss] Upgrade GTK+ and its dependent libraries for VMtools
+    
+    GTK+ and its dependent libraries are upgraded to:
+    gtk+       2.24.32
+    atk        2.28.1
+    gdk-pixbuf 2.36.11
+    pango      1.40.13
+    cairo      1.14.12
+    fontconfig 2.13.0
+    freetype   2.9
+
+commit a5c03957c95ec78c92246b87cdf60a90b2eca7f7
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit f87d177acab33f00229234ed51722504e2f7afc7
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    Changes to common header files not directly applicable to open-vm-tools.
+
+commit ba65905dfc7e6c07d1aeea37db885284e54b02fa
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    Set perms on Tools script logs.
+    
+    Make the network script logs secure; set log file perms to 0600.
+
+commit aa59d16e0b5968efc298065ef50ece282d406265
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    [Wayland DnD] Part2: Open the uinput device file with root permission.
+    
+    The device file /dev/uinput (or /dev/input/uinput) can only be accessed
+    by root account, so the dndcp plugin may failed to open this device file
+    if the current user is not root account.
+    
+    A way to fix this issue is opening this device file with root account,
+    then pass the file descriptor to the sub task which is started with the
+    current account. An example for this solution is blockVM file system
+    device file.
+    
+    This patch is part of the new feature 'Wayland support in Linux guest'.
+
+commit b3899c91d348d23c2e6c22944b8ac1a06e4e3988
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    [Wayland DnD] Part1: Add 'fakeMouse' module which is used to simulate the
+           mouse motion under Wayland
+    
+    For Linux guest with X11, the VMTools uses the X system APIs to simulate
+    the mouse motion, but these X11 System APIs do not work in Wayland. Need
+    to pick up another method to simulate the mouse motion.
+    
+    Another way to simulate the mouse motion is using uinput module.
+    
+    uinput is a kernel module that makes it possible to emulate input devices
+    from userspace. By writing to /dev/uinput (or /dev/input/uinput) device,
+     a process can create a virtual input device with specific capabilities.
+    Once this virtual device is created, the process can send events through
+    it, that will be delivered to userspace and in-kernel consumers.
+    
+    Here is the link which contains more information about the uinput module:
+    
+    https://www.kernel.org/doc/html/v4.12/input/uinput.html
+    
+    This patch adds a new module named 'fakeMouse' which is used to simulate the mouse motion under Wayland.
+    
+    This patch is part of the new feature 'Wayland support in Linux guest'.
+
+commit 995befcb0d6156fb47773c96db6d478173d1bc89
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:18 2018 -0700
+
+    Add new guest metrics to be consumed by vROps.
+    
+    Windows:
+    * ProcessorQueueLength
+    * CurrentDiskQueueLength
+    * AvgDiskQueueLength
+    
+    Linux:
+    * CPU run queue size
+    * Current disk queue size
+    * Average disk queue size
+
+commit 9d6cfe650cd15095e65024fbb5d9cd6944e1cf14
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Historical: Recording version numbers assigned for 10.2.x patches.
+    
+    Define TOOLS_VERSION_CHAINSAW_PATCH1 as 10.2.1.
+    Define TOOLS_VERSION_CHAINSAW_PATCH2 as 10.2.6.
+
+commit ba6c319f18d294b36c0e989f851fbfdbc8a629b7
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Bump up the version requirement for glib and friends to 2.34.0
+    
+    For open-vm-tools, we are bumping up the minimum version requirement
+    to 2.34.0 for glib and its friends. Modified the configure.ac
+    with the proper new version checks. Also, updated the
+    error message with the proper version.
+
+commit 26d03ad8075913cb869b814462b7285c02367252
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit ce1ed002f5e05f09678e15b4021bac8155edb1eb
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Common source file changes that are not directly related to open-vm-tools.
+    
+    Build vmtools and vgauth for Windows with xmlsec instead of
+    xml-security-c.  It will still be possible to build with xml-security-c
+    either by commenting out the definition of USE_XMLSEC_FOR_WINDOWS in
+    bora-vmsoft/vgauth/make/inc/defs.mk or adding a make command line
+    argument of USE_XMLSEC_FOR_WINDOWS=0.
+
+commit d5c0bcea04aae65484ba3c2756b64acf6f6388d0
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Update bora-vmsoft/install/Source/README
+    
+    The content is stale. Since the file is used internally and is
+    not published, rather than maintain it in two places, point to
+    the current README file and Release Notes on github.
+
+commit 512d5475520ec5e0525633cd47530faaae774b5e
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 982998c9a6a3ec8664f9c4c08ff9ef30f52a9ae2
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit ab36b3227275a5beded8a5115929e2d649c6aad3
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Common header file changes not applicable to open-vm-tools.
+
+commit 0527d5c5f14f626a5129231778ec433dfff55c2a
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:17 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 571dc1fbadd962d91dcb7a44652b501de3f48e0e
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 998903d73496bf6080053f994c8410dc880db2f9
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 3b814f9b4dcbf54893078a4ba187d8d0cbf23e31
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    lib/hashMap/hashMap.c:
+      Add new HashMap_Get() which uses a constant time memory comparison function.
+    
+    lib/misc/utilMem.c:
+      Constant time memory and string comparison functions.
+
+commit 5daceb4448834143d884b061f391c37aeaaad683
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Changes to common header files not applicable to open-vm-tools.
+
+commit 42d1e6b11c0b11c1b1f6f967cb5c4d7e2f3b39e0
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Change to common header file not applicable to open-vm-tools.
+
+commit f4b7b227119712c90be4a3583d4430a3fcc1d093
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Change to common header file not applicable to open-vm-tools.
+
+commit 874b8b4801a5bba439401db8e624e3e3d1989ca7
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Common header file change not applicale to open-vm-tools.
+
+commit ff2616a657c32bbb5e6799f8b8cd0a470d0e5202
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:16 2018 -0700
+
+    Common header file changes not applicable to open-vm-tools.
+
+commit 5d9cc73f1c7979466d55f7897f98c0888d2fb15d
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:15 2018 -0700
+
+    Header file change in preparation for C++11 compilation.  Also updating
+    copyright dates.
+
+commit 29fb30f6d1956ccd4ad803b1b7f0430e4ef28ceb
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:15 2018 -0700
+
+    FreeBSD vmmemctl: Fold in open-vm-tools pull requests #125 and #140
+    
+    This change incorporates two open-vm-tools pull requests that provide
+    code changes that allows the existing vmmemctl.ko driver to be compiled
+    on FreeBSD 10, 11 or 12.
+    
+    Pull request #125:
+    An optional argument has been added to the sysctl_add_oid() function
+    in FreeBSD 12.x. All releases have a SYSCTL_ADD_OID() macro that does
+    not require the additional argument.
+    
+    Pull request #140:
+    Functions and macros to lock and unlock memory pages and objects have
+    changed between the FBSD 10 & 11.  The pull request provides a set C
+    preprocessor directives to select the appropriate code based on the
+    FreeBSD release being targeted.
+    
+    The code change as been tidied up by using the release version checks
+    to define LOCK and UNLOCK macros for memory pages and objects at the
+    beginning of the source file.  The code logic is easier to follow
+    without the abundance of #if, #else and #endif statements scattered
+    about.
+    
+    Ed Schouten: https://github.com/vmware/open-vm-tools/pull/125
+    Steve Wills: https://github.com/vmware/open-vm-tools/pull/140
+
+commit 2a34b181de524b3f0d01cad90d3da184bde7ad99
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:15 2018 -0700
+
+    Common source file changes not directly applicable to open-vm-tools.
+
+commit fab45e62a1468b86d2097a6a0784c4f259d6b0ef
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:15 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 357e8418e5441c2c5fc75a19f7b6529d6bce7452
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:15 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit fad97e4a7c756b3b297e0fe9e68a1a4674c4fdcc
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 23 17:08:15 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 357d9139342c19a98ed12f5961f415d099df3287
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:36 2018 -0700
+
+    Common source file changes that are not applicable to open-vm-tools.
+
+commit 6c3261d152442fa11fc2b928490d74846f23465d
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:36 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 3747daca8efbfe8e709687b97c874a29f183b717
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:36 2018 -0700
+
+    Backout previous change to lib/include/vm_basic_math.h.
+
+commit f9414d19532a9664e6c260a8644ee09200e32429
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:36 2018 -0700
+
+    Common header file change: lib/include/vm_basic_math.h
+    
+    Define portability macros for Inf and Nan tests.
+
+commit de2010a1a45a9e515b932a1a83374539661a2b39
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    Add missing memory constraints for vm_atomic RMW (Read/Modify/Write) instructions
+    
+    There are two inseparable concepts involved when dealing with atomics:
+    1. Atomicity of the access itself
+    2. Ordering of the access with respect to other reads&writes (from the view of
+    other processors).
+    
+    Our Read-Modify-Write functions are all meant to provide the highest level of
+    ordering guarantee: Sequential Consistency, which means no reordering of reads
+    or writes across the access. We properly implement that on ARM, and on
+    x86/x64 at the hardware layer. But, on x86/x64 we needed to tell the compiler
+    (it must flush out any pending reads/writes that are currently hiding in
+    registers)
+    
+    Side Note: we do *not* change the pure Read and pure Write functions, only
+    the Read/Modify/Write ones. On both ARM and x86/x64, vm_atomic functions like
+    Atomic_WriteN provide no (re)ordering guarantees today (at the hardware layer
+    on ARM or at the compiler layer on x86/x64). This is because some callers
+    didn't need or want such guarantees - as such, Atomic_WriteN by itself is
+    *not* sufficient to, say, release a lock. Making these remaining atomic
+    weapons safe by default will require us to first
+    1. add new unordered atomic equivalents of Atomic_ReadN/TestBitN and
+    Atomic_WriteN (in C11 terminology, acquire/release and relaxed)
+    2. Scan the tree and switch appropriate callers to the new functions
+    
+    *and only then*
+    3. Strengthen the defaults, affecting only callers who needed the stronger
+    defaults to be correct. ... but that would be a separate change in the
+    future.
+    
+    Codegen differences (vmm.vmm64):
+    --------------------------------
+    The function that uncovered this was ST_HandleCrossCall, which invoked
+    Atomic_And64.
+    
+    original w/o explicit compiler mem barrier in ST_HandleCrossCall:
+    ...
+    lock and 	QWORD PTR [rdx+0x0],rax
+    movsxd 	rax,DWORD PTR [rip+offset]  <-- load reordered after Atomic_And64
+    lea    	rax,[rax+rax*2]
+    lea    	rdi,[rax*8+0x0]
+    
+    with "memory" constraint, it's now identical to code w/an explicit
+    compiler mem barrier (which was the workaround):
+    ...
+    mov    	edx,DWORD PTR [rip+offset]  <-- load emitted prior to Atomic_And64
+    ...
+    lock and 	QWORD PTR [rsi+0x0],rax
+    movsxd 	rax,edx                     <-- ... and used after Atomic_And64
+    lea    	rax,[rax+rax*2]
+    lea    	rdi,[rax*8+0x0]
+    
+    vmm.vmm64's .text section shrank 28 bytes
+    vmware-vmx's .text section shrank 16 bytes
+    
+    Given that these are tiny fractions of the .text section, this suggests the
+    problem was quite rare, which is why it escaped our attention until now.
+    (Testing of vmx's lib/lock, lib/sync, lib/vprobe, and lib/misc saw no
+    differences with GCC 4.4, 6.4, 7.1 or Clang)
+    
+    While in there: nuke some tabs
+    
+    Slated for a future change: vmkapi_atomic.h
+
+commit 333ac41076afff4e31ccb0d0688e1581e8c9019a
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 8671bd8d4f68a490a5b20f1876f05797f3057c4b
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    vmcheck.c VmCheck_IsVirtualWorld(): Always check for a working backdoor.
+    
+    The specific checks for Xen and VirtualPC hypervisors currently happen
+    only if the VMware hypervisor is not detected.  The test for a working
+    VMware backdoor is then done to avoid all other hypervisors.
+    
+    In the case where running on a VMware hypervisor and the backdoor
+    channel has been disabled such as with
+    
+       monitor_control.restrict_backdoor = "TRUE"
+    
+    vmtoolsd, vmware-toolbox-cmd and vmware-checkvm will crash when
+    attempting to get the version number of the installed VMware Tools.
+    
+    Added an additional test to detect Linux KVM with the existing tests
+    for the Xen hypervisor and Microsoft Virtual PC.  Avoid checking for
+    a working backdoor if a non VMware hypervisor is seen.
+    
+    Microsoft Hv checking to be added later and is tracked in a separate PR.
+    Oracle VirtualBox provides no unique CPUID vendor signature string.
+
+commit 09958952cc761075d5546b18bed0ce59260ec4db
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    FreeBSD open-vm-tools kernel modules compilations cannot locate <stdint.h>
+    
+    With the change for VMware headers to utilize the standard types
+    defined in C99 standard headers, the compilation of FreeBSD kernel
+    modules must specifically add /usr/include to the compilation
+    options.
+    
+    CFLAGS += -isystem /usr/include
+    
+    This change updates the Makefiles's for FreeBSD kernel modules and
+    drivers.
+
+commit cdf0406dc669f2284e1e810ac5820f123d46a50e
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    FreeBSD: Improper use of sysconf() for getpwent buffer size leads to
+             vmtoolsd crash.
+    
+    On FreeBSD, sysconf(_SC_GETPW_R_SIZE_MAX) can return -1 if it has
+    no hard limit ultimately resulting in an incorrect buffer size.
+    
+    This change is adapting the sysconf() ifixes done elsewhere to
+    bora-vmsoft/services/plugins/vix/vixTools.c and updating the
+    open-vm-tools AUTHORS file to share credit for the pull request.
+    
+    https://github.com/vmware/open-vm-tools/pull/238
+
+commit e20e9bd49d244749ee6bcd4ea7d57a26d891afbe
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 7e03f0676a8d1a8667d7d6aeda968a74c8708c0e
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 0c4420178932c1879f402ece689e5cfaf5f37d84
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 15:05:35 2018 -0700
+
+    CAF changes for Windows; not applicable to open-vm-tools.
+
+commit e9463abdc0d56d0612237faf01a5736c9998b499
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:12 2018 -0700
+
+    sysconf() usage leads to crashes in BSD tools
+    
+    Not using the sysconf interface properly when determinining the
+    getpwent buffer size. Fix this.
+    
+    Problem was identified and proposed fix was submitted in pull request
+    https://github.com/vmware/open-vm-tools/pull/238
+
+commit 4eff69adab058331a1e93aee17ed9a4e13fa8714
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:12 2018 -0700
+
+    [lib/file]: remove useless heap allocation
+    
+    FileIO_AtomicUpdateEx allocates the argument to the "swap" ioctl
+    on the heap. This argument is a struct which contains a single int
+    fd... there is no need to heap-allocate it, the stack is just fine.
+
+commit 6de42f7d96fb5c70d70ae3b68011477f8b93aef2
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:12 2018 -0700
+
+    bora/lib: Use _exit when in the context of a signal handler
+    
+    There are a few cases in bora/lib where exit(3) is used in the
+    context of a signal handler. It was recently noticed that exit(3) is
+    not async-signal-safe, and _exit(2) should be used instead.
+    
+    This patch changes a call from exit(3) to _exit(2) in bora/lib.
+
+commit 54415a34a372388374bf322d8118ef47c7b0f9f7
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:12 2018 -0700
+
+    Hgfs FUSE Client: enable the FUSE client for RHEL 7, Ubuntu 14.04 and others
+    
+    The RHEL 7.x releases are all kernel 3.10 based. Currently the Hgfs FUSE
+    client will not be enabled for these earlier kernel versions, enabled only
+    for 4.0 kernels and later.  This means for default tools install on plaftorms
+    running those kernel versions the Hgfs kernel client must be installed and
+    used for Shared Folders.  The consequence of this means that the tar tools
+    installer must be run to provide the Hgfs kernel client on top of the OVT
+    install.
+    
+    To remove the need to install the tar tools we must enable support for the
+    Hgfs FUSE client, which just requires the kernel version check to be modified
+    from 4.0.0 to 3.10.0.
+
+commit 84977ad9a0ca964d5873516c42efec328bac23c9
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:12 2018 -0700
+
+    Changes to common header files; not applicable to open-vm-tools.
+
+commit 587d95eeadbdab2f20020ef24686bd989af6d8b0
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    lib/misc/hostinfoPosix.c: Fix sscanf format string case typo.
+
+commit 8e22cb4da06036b71a06698da3377ed72cfef440
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    Changes to common header files; not applicable to open-vm-tools.
+
+commit 9e3738b457eba1d9f8302fa449e9521da59f2dfd
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    Changes to common header files; not applicable to open-vm-tools.
+
+commit 18358aecd27f7d77b71d5ab31250edc600b7bfbc
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    Changes to common header files; not applicable to open-vm-tools.
+
+commit 670dba44e90c64173a1f67e617a7193f18fc3a2c
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 5fe941cd27194495811036667d312f14aece1975
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 03faa87192b23354a996b4d62282c002de002c59
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Mar 23 14:57:11 2018 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 2438cefba37d37de65bf2003b1880f47b529ef47
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:43 2018 -0800
+
+    Enhancements for rpcChannel library.
+    
+    rpcChannel.c file contains the code for building rpcChannel library. A good
+    amount of the same code is duplicated in rpcChannelSimple.c file to
+    build a simplified version (no glib dependency) of the rpcChannel library.
+    It's recommended to remove the duplication and maintain only one single
+    file which can be used to build both 'glib-dependent rpcChannel' and
+    'glib independent rpcChannel' library.
+    
+    This changeset implements the following changes:
+    * Removed rpcChannelSimple.c
+    
+    * Renamed I_USE_SIMPLE_RPC make variable to USE_RPCI_ONLY. If this
+    flag is specified, rpcChannel library will be built using only RPCI.
+    No dependencies on rpcIn will be added. This inturn will remove
+    dependencies on dynxdr, xdr and glib.
+    
+    * Modified the RpcChannelInt structure to have only the necessary
+    attributes when USE_RPCI_ONLY is defined.
+    
+    * Modified a bunch of functions into '#if defined(NEED_RPCIN)' block
+    to make available only when necessary.
+    
+    * Modified guestrpc.h to provide the declarations for few RpcChannel_*
+    functions only when needed.
+    
+    * Modified rpcChannel library to implement necessary stub files / functions
+    when it has to be built 'with rpci only' setting.
+    
+    * Removed various copies of 'glib_stubs.c' maintained by different
+    consumers of rpcChannel (appmonitorlib, vmGuestLib, 'imgcust' components).
+    
+    * Modified the make files of various consumers (vmGuestLib, appmonitorlib,
+    imgcust components [linux-pkg-deployer, guestcustutil, UnitTest]) to
+    remove the dependencies for dynxdr library.
+    
+    * Did some code refactoring.
+    - Removed some dead code in some make files.
+
+commit 87be66f17bf7911a8ec59ce9917778f7f653a398
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:43 2018 -0800
+
+    Implement a new function VMTools_GetTimeAsString.
+    
+    * Implemented a new function VMTools_GetTimeAsString in
+    vmtools library which returns a properly formatted UTC timestamp
+    information. This function can be used by different modules / plugins
+    in 'VMware Tools' to add the timestamp information in log files.
+    
+    Example of UTC timestamp information: "2018-02-22T21:17:38.517Z"
+    
+    * Modified vmtools logging module to call the new function and
+    prepend the UTC timestamp information in every log message.
+    
+    * Modified deployPkgLog.c to use the new function.
+    
+    * Removed references / definition of System_GetTimeAsString since
+    it is no longer used anywhere in the code.
+
+commit acbf7d90add72d9d3aa70bb8677179e7b3d28e23
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:43 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 87ddd2684bff33836db5667718449f42642c76e2
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:43 2018 -0800
+
+    GOS Table: The official Amazon Linux 2 string is "amazonlinux2-64"
+    
+    The hosted UI isn't creating an Amazon 2 VM with the correct guest OS
+    identifier string. Fix this.
+
+commit 91b42f829a0ddc13a1657610700332dad7a9e362
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:43 2018 -0800
+
+    Fix vgauth log timestamps to have zone and use UTC
+
+commit d225ed26cca556f559c035234d11bd7d380c6d7f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:42 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools
+
+commit d585ee8fcc4135d6d52fdc38ec2e0ca747663bf7
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:42 2018 -0800
+
+    Compilation fixes to build Tools with VS2015
+    
+    This change consists of fixing warnings/errors as a result of building Tools with VS2015.
+
+commit 03c98a1fb30513b223e3d6eafb21b5f4d4c6c5bc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:42 2018 -0800
+
+    Add timestamp information to each deploypkg log message.
+    
+    * Modified deployPkgLog.c file to prepend UTC timestamp information
+    to each log message coming from 'deploypkg' module in 'VMware Tools'.
+    
+    * Used bunch of glib functions to get the current UTC time. As per
+    the glib manual, these glib functions are available since 2.26. 2.26 was
+    released around 8 years ago which is kind of very old. Having the glib
+    dependency on 2.26 is OK.
+    
+    * Did some minor code refactoring. In DeployPkg.c file, at all
+    call sites for DeployPkgLog_Log, replaced the hard coded values with
+    the proper LogLevel enums.
+
+commit 73a21a057dc23cf428b5fa1799eb0c5945732fee
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:42 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 3eb8434aebde9a2eebc65d57044d8ea6367d685f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:42 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 24e9d211752210abb94bd1e76bec8be20d8abef8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:42 2018 -0800
+
+    vm_basic_types.h: enable stdint.h for c99
+    
+    C99 mode (a.k.a. __STDC_VERSION__ >= 199901L) guarantees
+    the stdint.h header will be present, which means we can use it
+    for standard types instead of rolling our own.
+
+commit b4016c210e7cb6c0407d40dba5edfa64d550bef3
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Mar 6 10:38:41 2018 -0800
+
+    Don't lose errno/lastError when logging
+    
+    guestOps need to see errno/lastError in order to return the proper
+    error to VIX/guestOps APIs.  Logging (at any layer) can cause these
+    to be overwritten, so make sure they're preserved.
+
+commit 14a0ffe23be6437c9ee656ccf2d516ead6265dfd
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 19:23:18 2018 -0800
+
+    Enhancing CAF listener preconfigured check logic to update the preconfigured flag at runtime
+    
+    1. Preconfigure listener and start listener upon tunnel enabled logic are
+       invoked in two different threads.
+    2. There is a case where preconfigure logic is performed after the
+       pre-configured flag is computed in the enable-listener thread.
+    
+    The current patch invalidates the flag in the start listener thread and
+    should guarantee the preconfigured status is up-to-date.
+
+commit 60f7afc97264435e1c04c2e70fe39397261b52b4
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 19:22:04 2018 -0800
+
+    CAF MA Performance Issues
+    
+    CAF MA Performance Issues
+    
+    Vmware CAF ManagementAgentHost service was polling every 5 secs to check if Guest Network "Tunnel(port 6672)" was enabled to preconfigure & bring up Vmware CAF CommAmqpListener service.
+    This resulted in more CPU Utilization as opposed to previous release in CAF & caused regression in vmtools 10.2.0.
+    We are increasing the Poll rate to 5 mins, which fixed the issue & is giving us the same CPU/memory utilizations as in vmtools 10.1.0.
+    
+    We were checking for the different stages of listener preconfiguration status from the listenerpreConfigure.txt files in the polling time interval, which caused increased IO operations.
+    To fix that we have stored the value of listener preconfiguration status from the files into a variable locally & using the same at all places instead of file access.
+
+commit 872baeed3fd1e79f89143baa0b9c47077b655567
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:08 2018 -0800
+
+    lib/file: add File_MakeSafeTempSubdir
+    
+    File_MakeSafeTempDir and File_GetSafeTmpDir are typically used to create
+    "safe" temp dirs on Windows and Linux. These are dirs in a known-secure
+    location with known-secure security attributes that only allow access to
+    the current user. These APIs work fine. However, on Windows if one creates
+    a subdir inside the safe dir, the subdir may be given an unexpected
+    (and overly restrictive) set of default DACLs on it in unusual situations.
+    The solution is to introduce a new API specifically to allow a caller to
+    create a subdir within an existing safe dir that ensures the DACLs
+    are exactly what are needed.
+
+commit bdbab22ec42544dbfff657b811d695e5b5a6d429
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:08 2018 -0800
+
+    Remove the header file safetime.h
+    
+    This removes the file itself.
+
+commit 047f05f379eb73530ac943d35cda5c162e045fa2
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:08 2018 -0800
+
+    Common source file change; not applicable to open-vm-tools.
+
+commit 2c927bb65029cb89ba0c4b7ba9b341890166823d
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+
+    Skip specified file systems when doing a quiesced snapshot on Linux
+    
+    Add a tools.conf setting "excludedFileSystems" that specifies one or
+    more file system mount points to be skipped over when performing a
+    quiesced snapshot on Linux guests.  The value of excludedFileSystems
+    is a comma-separated list of glob-style patterns as recognized by the
+    glib routines described here:
+    
+    https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.html
+    
+    With this change, when performing a quiesced snapshot, the sync driver
+    freeze routine removes from the list of mount points it is to process
+    any path that matches a pattern in the excludedFileSystems list.
+    
+    In the course of testing the change, a bug was found in SyncDriverFreeze
+    in which it returned SD_ERROR rather than FALSE when the path list is
+    empty.
+    
+    This change also includes some whitespace cleanup in syncDriverWin32.c.
+
+commit 9fb904dbdbd12952f2743d1463cda56a72c50c90
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+
+    lib/file: Paranoid clear of old cached values
+    
+    Rare, but an app might toggle addPid; cover this.  Also optimize the
+    cache update.
+
+commit d244dac08f07cbbcba3f66eab7d78c16150edfba
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+
+    lib/file: File_GetSafeTmpDir is not aware of credentials changes
+    
+    Some applications may masquerade their use (change their EUID).
+    Futhermore, each thread in an application can have a separate EUID.
+    
+    Anytime a application or thread asked for its safe temporary directory,
+    it needs to get the same result regardless of how many times it asks.
+    
+    Change File_GetSafeTmpDir to cache the EUID associated with the cached
+    values. If there is an EUID change, invalidate the existing cache
+    entries and recompute them. The recomputation process is stable, in
+    that it will obtain the same return any time it is called.
+    
+    This way we get the benefit of the cache (performance), ensured
+    correctness (for applications that do not masquerade), and correctness
+    for those applications that do masquerade.
+
+commit f9177b133f7f683fcc0f85770712d8069ec52421
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 4da56779c42a55ce1b872748f9d6fd90bd10d281
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+
+    lib/file: Clean up POSIX File_GetSafeTempDir() in fileTempPosix.c
+    
+    Make things clearer.
+
+commit f608f63948520ab2088870a800bcc62c67a416ab
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+>>>>>>> open-vm-tools/ChangeLog
+
+    Changes to common header files; not applicable to open-vm-tools.
+
+<<<<<<< open-vm-tools/ChangeLog
+commit 3011466e0f59471292a58ba5124238898d18945a
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+=======
+commit 5d98c8b5183e236dc8fb548647574f4b24e87d23
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:07 2018 -0800
+>>>>>>> open-vm-tools/ChangeLog
+
+    open-vm-tools: use ENV{DEVTYPE}=="disk" in udev scsi rule
+    
+    Fix udev scsi rule to not print warnings on boot.
+    The rule now checks for the device type. The previous fix by
+    trying to check for a valid timeout field did not work as expected.
+    This change uses the rule from Mike Latimer at
+    https://github.com/vmware/open-vm-tools/pull/216
+
+<<<<<<< open-vm-tools/ChangeLog
+commit 9da6562e0c04fa79fad726513508a628f29f4812
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 6ccc073a58e1822dc4eb8c20e10dc89791643e9c
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Fix memory corruption bug in StdIO_ReadNextLine
+
+commit 4f729b61b908c82318b8dcfc16264c15b58817c8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Common header file changes not applicable to open-vm-tools.
+
+commit 9fa726051f7efe1b7e0bab745b7bad85d1fb3efb
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Common header file changes not applicable to open-vm-tools.
+
+commit 378c193d4a57cfed14045ffed6ea641957ed18c7
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit ba83dcff6214190f8ed545401f2bfa27650bbf07
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Common header file change not directly applicable to open-vm-tools.
+
+commit fc922804318de417578fd08fab2e07c1d58e8de8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    Update copyright year to 2018.
+
+commit ca39511ceb8e88254cad71e98cba5cbfff08a99d
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+
+    UUID: Clean up UUID_PackText
+    
+    Use size_t, not int.
+
+commit c358e5e181b95d872da9ffcc943cc147ae0584f8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
+=======
+commit 65a35ec640223e4455e016c883261f514eb21492
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:06 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit aefcbec68487e14de8938fafbf0606a9ce37b2b9
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:06 2018 -0800
+
+    Skip davfs mount points during quiescing (part 2)
+    
+    Refactor the change to skip davfs mount points.  Capture the length
+    of the static URL prefixes at compile time and avoid repetitive
+    strlen() calls when checking each active mount point.
+
+commit f459a325c4eec2e31eddc7f74901623b30ea0525
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:06 2018 -0800
+
+    Skip davfs mount points during quiescing
+    
+    The davfs2 is a Linux filesystem that allows mounting a Web Distributed
+    Authoring and Versioning (WebDAV) network resource as a local filesystem.
+    On some Linux releases, the FREEZE ioctl() is rejected and quiescing
+    these filesystems is not attempted.  On others, however, the FREEZE is
+    not rejected and there exists the potential of a quiescing deadlock
+    if the davfs2 attempts to write to its cache in /var which has already
+    been quiesced.
+    
+    This fix is to avoid a potential deadlock by excluding davfs2 mounts
+    as the networking filesystem they are.  Since davfs2 may be implemented
+    on the Linux fuse (default) or coda filesystem kernel module,
+    the detection of these network mounts must be based upon detection
+    of the URL prefix of the mounted device name.
+    
+    The static function SyncDriverIsRemoteFSType() is being updated to
+    not only exclude remote filesystems based on filesystem type but also
+    to exclude davfs2 remote filesystems by the "http://" or "https://"
+    URL prefix on the device name.  The function name is being changed
+    to SyncDriverIsRemoteFS().
+
+commit 3af8139cfcb4578dd9d7cd9a85301ed808775eb4
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:06 2018 -0800
+
+    vm_basic_types.h: scrub FMTxx specifiers
+    
+    Reduce the amount of magic in vm_basic_types.h... nowadays, any
+    system we support (including Tools) DEFINITELY supports C99-style
+    specifiers, with two exceptions: pre-vs2015 MSVC, and pre-10.13
+    macOS kernels.
+    
+    Rip out all the pre-C99 junk. Add a few comments explaining exactly
+    what the caveats here are.
+
+commit 442683ac70f1f1c8665feb347be40cac5c8edd65
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:06 2018 -0800
+
+    amazonlinux2-64 should use OVT only, not tar tools linux.iso.
+
+commit b4e66d7ac1f29b4d81877741c0dc85b8eeb68365
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:06 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 16e63100ba9aeb419d22d8ade3af1eda2e3f02c0
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:05 2018 -0800
+
+    Changes to common header files; not applicable to open-vm-tools.
+
+commit f5b05ca724708bd54b5c5b7dc3f9d0d959134773
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:05 2018 -0800
+>>>>>>> open-vm-tools/ChangeLog
+
+    Common header file change; not applicable to open-vm-tools.
+
+<<<<<<< open-vm-tools/ChangeLog
+commit 0ccc8b1a79bf76b9826c37b2133e5dbd4b9904dc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 5c6f7b09d6865496036653360301092b8672675f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    guestOS identification: Tweak handling the LSB
+    
+    The multi-standard handing code dealt with the LSB strictly. This
+    causes some issues with older distros that are not LSB compliant but
+    happened to work due to a specific behavior.
+    
+    Return the LSB to "LSB and old way" and provide some specific coverage
+    of detaults to ensure coverage.
+
+commit 2516f528e47722faa38868d99939c825f13c2bdb
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Restore "ufs" to the list of known filesystems
+    
+    Removing extraneous #ifdef VMX86_TOOLS - #endif
+
+commit 3c453912325ead3f19b84fced65217608069ddfa
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Restore "ufs" to the list of known filesystems
+    
+    A previous change, 5074636, to remove "ufs" from the kernel also removed
+    "ufs" from the known list of Linux filesystems.   As a result, the "ufs"
+    filesystems on FreeBSD and Solaris VMs cannot be seen and therefore
+    no disk information is available in vmsvc/get.guest output.
+
+commit aa6502a057aec571a72b971cb13cf0e9d713cddc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Update tools copyright to 2018
+
+commit 5af33281a66ebf0c30ad15074f931f33bda0bc9d
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit dc028e7bbb63865e1ae1c6262872e74c47c80d61
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Common header file change that is not applicable to open-vm-tools.
+
+commit d55cc529267b0b385fc9d4453075d023c789e46f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Hgfs Server: replace duplicate function usage with a common function.
+    
+    This change simply replaces a duplicate function usage with a common
+    function and removes the duplicate one.
+
+commit ccdef7096a4782dd00b6f55695aff9c3f01cf4b5
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    hostinfoPosix.c: Change a warning to a log message.
+
+commit 2321ff31fa671658ad0af3af22eef27e5d9af050
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    Switch IMC to use RpcChannel_SendOne instead of deprecated RpcOut_sendOne
+    
+    Modify ./libDeployPkg/Makefile.am to build deploypkg module for
+    open-vm-tools correctlly.
+
+commit d9f7c825cfbe075c3b643632419ff26a72628e41
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:38 2018 -0800
+
+    lib/file: Clean up a few things.
+
+commit b4ee6678c9dd8cdf4e144056545dd41ba0636085
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    hostinfoPosix.c: Pick up some review comments
+
+commit ce060ca498defdf08da4fac899dc623328d47a5d
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    GuestOS: Support the os-release standard
+    
+    While bringing up Amazon Linux as a guest, it was discovered that
+    Amazon Linux was not LSB compilant. The LSB standard defines a way
+    to uniquely determine which distro one is running on. Since our code
+    was based on the LSB standard, we made some changes to explicitly
+    detect Amazon Linux and handle it as a special case.
+    
+    Amazon let us know that there is a "new" standard - os-release - which
+    they are compliant with. One must explicitly install Amazon Linux in a
+    special way to obtain the LSB compliance.
+    
+    Researching the "new" standard, it turned out to not be that different
+    than the LSB standard. Further research showed that some distros (e.g.
+    Ubuntu) are releasing with both standards.
+    
+    This change refactors the existing code, removes the explicit Amazon
+    Linux checking, and accepts the os-release standard. Amazon Linux then
+    "just falls out".
+
+commit 6bd88d82e943d691c4312e3f2e7cef1038af7a9c
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    Reduce Vigor transport socket draining overhead
+    
+    A previous change in VigorPollImpl and asyncsocket to fix a memory
+    leak that causes a performance regression for parallel reconfiguration of
+    running VMs (the kind requiring FSR).  During an FSR, the connection
+    between hostd and the source vmx would drop and hostd would then
+    reconnect to the destination vmx.  One source of regression is that
+    the buffer has to be drained when a disconnect happens and the draining
+    logic may potentially unregister and re-register the recv callback
+    multiple times.  This change adds an asyncsocket function specifically
+    for draining recv that reduces the manipulation of callback.  It
+    reduces the regression by up to ~50% (the effect is more pronounced with
+    more VMs).
+
+commit de9b602664d91c54288b91a81f6a01d7cb927fce
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    atomic: add TestSetBitVector and TestClearBitVector functions
+    
+    Implement atomic set/clear bit from a byte array.
+    
+    Also add missing "memory" constraint to non-atomic ClearBitVector()
+    and ComplementBitVector().
+
+commit 17e9209aeb4f6d3a3535b7064916f3a25b985395
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    Tools Hgfs Server Plugin: fix logging of client redirector handling functions
+    
+    Modify logging of client redirector handling functions for starting the client
+    redirector kernel component and reconnecting mapped drives at services start
+    up. This changes the level from warning to info as these messages are purely
+    informational and not warnings of unexpected events or conditions.
+
+commit 076b7201b61af9f3dcb36050ff37a8145a05d404
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    Fix error reported by clang 6.0.0 - comparison 'int' <= 4294967295 is always true
+    
+    Fix the logical constant compare warning/error in vixTools.c of the
+    vix plugin.  Rewrite the continuous for loop to simply iterate from
+    zero to MAX_INT32.
+
+commit 7a58576e98e5bdb47fbe101c43b106ba77f2e811
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    Add VMware Tools 10.2.5 to vm_tools_version.h
+    
+    - Add tools version 10.2.5 as the first scheduled tools 10.2.x
+      update - TOOLS_VERSION_CHAINSAW_UPDATE1
+    - Corrected a typo in a macro name in an earlier tools version
+      definition.
+
+commit 13c49b85cebacea847d30c4e5a0b92fa7ea9dba8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:37 2018 -0800
+
+    hostinfo: Identify Amazon Linux
+    
+    Amazon Linux is not LSB compliant. Add a small amount of code such that
+    Amazon Linux can differentiated from all of other Linuxen and correctly
+    report its identifying data.
+
+commit c5bc784da611ee929e0da7c20a410e03e6540613
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:36 2018 -0800
+
+    Set X11 as the backend for gtk3 of open-vm-tools
+    
+    Open-vm-tools defaults to gtk3.  For distros like Fedora 27, Wayland is
+    the default display server.  With no restriction on the backend, plugins
+    will try to use Wayland as the backend of Gtk+3.  As a result,
+    gdk_display_get_default() returns a Wayland display;
+    gdk_display_get_default_group() also returns a Wayland window.  Applying
+    GDK_WINDOW_XID() on the Wayland window will result in the crash reported
+    on recent Linux releases that default to a Wayland display server.
+    
+    As X11-specific code is widely used in tools plugins, a migratation to
+    Wayland in the short term is not possible.  So, as a compromised solution,
+    plugins can be forced to run on XWayland, which is the compatible mode
+    of Wayland for legacy X11 clients.
+    
+    gdk_set_allowed_backends() only applies when flag GTK3 is defined, and Gtk
+    version cwgreater than 3.10.
+
+commit 98e0ab52c86b3a1d4fd38cec6913b1f5ba0f336c
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:36 2018 -0800
+
+    hostinfo: More cleanup
+    
+    Continue the prep for Amazon Linux.
+
+commit ce769ae4aa3a14810b418c044629f2d9dcb72a37
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:36 2018 -0800
+
+    hostinfo: More prep work for Amazon Linux support
+    
+    Amazon Linux is not LSB compliant but it does have a file that is
+    much like an LSB compliant release (name=value pairs). Make the names
+    of the structures generic... the logic can be reused for Amazon Linux
+    in a follow up change.
+    
+    Fix up some function headers.
+
+commit 7fce1b8f9ec60c27865717f536a4e440587500ad
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:36 2018 -0800
+
+    Refactor HostinfoOSData...
+    
+    Refactor the HostinfoOsData in several smaller and simpler routines.
+    This will make it easier to maintain in the future (it was pretty
+    unwieldy already) and easier to add the logic for a non-LSB Linux.
+    
+    More refactoring and actually adding the Amazon recognition code will
+    follow.
+
+commit b2b71c7995f4389cd7a9899dca8aa29bd9fa9c6a
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:36 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 40bcee40c892cc7de92825cce1226576d6eab66c
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:35 2018 -0800
+
+    Changes to common source files:
+    
+    lib/asyncsocket/asyncsocket.c: Use ASSERT instead of VERIFY when removings
+                                   poll callback in AsyncSocketCancelRecv.
+    lib/include/vm_product_versions.h: Change not applicable to open-vm-tools.
+
+commit 757833d601541e9bde24571fa22e669900e98a7e
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:35 2018 -0800
+
+    Change the glibc constraint to 2.11 from 2.12.
+    
+    Earlier, we made a change to stop building open-vm-tools
+    for LINUX systems with glibc < 2.12 But SLES 11 SP4 which is
+    supported comes with glibc 2.11.3 The check will
+    block SLES 11 SP4 from moving to OVT 10.2.x To fix it, this change
+    relaxes the glibc constraint to 2.11.
+
+commit 75825dcc7548d779f23c4c93429736d690d86a45
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:35 2018 -0800
+
+    Hgfs: remove Hgfs VMCI transport header from linux open-vm-tools
+    
+    Linux Hgfs clients do not use the VMCI module for a transport and have
+    since migrated to a FUSE implementation. Therefore we do not need to
+    include the Hgfs VMCI transport header file.
+
+commit 09b6621863ece170e4fc6b617f0bc1e3d17867f2
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:35 2018 -0800
+
+    Hgfs Server: fix error result for new dir creation in the virtual folder
+    
+    The Hgfs server code detects when a client tries to create a new folder in the
+    virtual folder containing the VMware Shares. This is not allowed as only the
+    host can add new Shares which appears in this folder. The current error code
+    returned to the client in these cases is access denied. This is only correct
+    when the new folder does not collide with an existing share. This stops clients
+    treating the virtual folder as a regular read/write physical folder. However,
+    for the case where the name collides, the access denied error is not correct,
+    as it does not tell the client the folder already exists. This causes some
+    applications to fail as they expect to see this error if the path component
+    exists as that is okay and expected. At this point the application will continue
+    to traverse the path and ensure the next component exists or if not create that.
+    
+    To ensure that applications don't prematurely fail and can test that the share
+    still exists in the path the Hgfs server should return HGFS_ERROR_FILE_EXIST
+    and leave HGFS_ERROR_ACCESS_DENIED for all other cases.
+
+commit fb3630fb0d7846b9f06f0c506c38eadf0cfbfa81
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:35 2018 -0800
+
+    Hgfs: get rid of vmware_pack_begin and vmware_pack_end header files
+    
+    Get rid of vmware_pack_begin and vmware_pack_end header files and
+    replace with the pragma pack and pop.  This code currently only
+    affects Windows clients and the VMX HGFS VMCI transport.
+
+commit f7c551253400e7f153cc696b5b121cd6e0d4ebd8
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 26 15:04:35 2018 -0800
+
+    GOSTable: Amazon Linux 2
+    
+    Add the basic support for Amazon Linux 2. The distro identification
+    code will follow in a separate change.
+
+commit c8f7c09d106884c19100077fdffe8f11b80d6bdb
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Changes to common header files not applicable to open-vm-tools
+
+commit 5939eaefbad529e811c64b46d93ddcce56615db8
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Common header file change not applicable to open-vm-tools
+
+commit 55f323265bb7aee605a40f289f9c1a8ba7be56c6
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Common header file change not applicable to open-vm-tools
+
+commit d42e5bf76689c820dfb84d681c007c96197f6182
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 90819beef53238ba108be35cba93329b9d160de7
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Get rid of convertutf and bsd_printf for all non-Win VMware Tools
+    
+    The MsgFmt_* functions are referenced in a few utilities
+    related to VMware Tools. This change replaces the MsgFmt_*
+    with a stub. This also affects the Windows version.
+
+commit e5e478d46f047aa8f22b427b9d4505581af9915a
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Fix the SSL/AsyncSocket "SSL_shutdown:shutdown while in init" problem
+    
+    QE regression tests have caught a bug in the bora SSL/AsyncSocket
+    layer. A normal SSL connection could be abnormally terminated by some
+    other random connections.
+    
+    Seems a common bug of the SSL usage according to the link below.
+    VMware is not the first one to hit it. :-)
+    https://marc.info/?l=openssl-users&w=4&r=1&s=shutdown+while+in+init&q=b
+    
+    The cause is that the SSL error queue was not cleared before
+    calling the SSL IO functions like SSL_write,read,connect,accept.
+    Refer to the man page of SSL_get_error, Paragraph 2 of the Description.
+    Fixed the problem by adding addtional call to clear the error queue.
+    
+    Found another problem that the system error is not preserved between
+    where it is set after the SSL IO call and the use of it to determine
+    whether to retry the SSL IO. This is probably due to tools has its
+    own logging which does not preserve the system error number.
+    Fixed the logging.
+
+commit 8a9c43698ebcc858314ec1c041d24b8e8d1372cf
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    vm_basic_types.h: use stdint.h a little more.
+    
+    Now that enough of the builds are C++11, let's make the common case
+    use the <stdint.h> header to define the intNN types directly
+    from language-standard intNN_t types, and treat pre-C99/C++98
+    code as the special case.
+    
+    This also provides some clarity about the last __STRICT_ANSI__
+    macros in this file.  One was related to usage of 'long long' in
+    strict c90 mode and has been replaced with a comment indicating that
+    64-bit-variable compiler extensions are mandatory (strict c90 mode is
+    not allowed via the headers).  The other related to X11 headers; those
+    headers have been examined to understand the workarounds needed and
+    the exact scenario(s) that are problematic have been commented (turns
+    out FreeBSD had nothing to do with the problem).
+    
+    Finally, all the Bool-related definitions have been moved and merged
+    to a single location NOT at the top of the file.
+    
+    Net effects of this change:
+    - non-linux C++11 (so Windows+Mac) now uses stdint.h
+    - exact set of macros involved in declaring Bool is reduced
+    - compiling with c90 mode really will break now (use gnu90 instead).
+
+commit 2674b02449875b04889be00400f52351105ab25f
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Consume vmx headear files in bora tree instead of gosc's own copy
+    
+    1. Consuming header files from bora/vmx instead of gosc/vmx
+    2. Deprecated "gosc/vmx/public/toolsdDeployPkg.h",
+    use "bora/guestABI/include/vmware/guestrpc/deploypkg.h" instead.
+    Combined macro definition to the new header file and modified
+    reference accordingly.
+    3. Modified makefile for open-vm-tools to consume new header file,
+    removed old header file staging in open-vm-tools.stage
+
+commit bd018012a08579e89209e23b69963937210e5182
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Common header file change  not applicable to open-vm-tools
+
+commit 36929119b9e28df8e267c49b5661354253439215
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    Remove some __STRICT_ANSI__ guards in vm_basic_types.h
+    
+    Some time in the distant past, these guards were needed to
+    work around... something. (Probably, it was that 'long long'
+    is not a valid type in strict c90 mode). Note that we don't
+    use c90 mode, we only use gnu90 or c99.
+    
+    This ends up being relevant because for C++ we are indeed
+    using -std=c++11 (which implies __STRICT_ANSI__). The Linux/C++
+    section of this file thus had duplicate definitions (which I am
+    now removing) to work around the gap.
+    
+    Quick cheat sheet for -std= values:
+    - c90 := __STRICT_ANSI__, no long long type
+    - gnu90 := c90 + gcc extensions, has long long type
+    - c99 := __STRICT_ANSI__, has long long type (defined in c99)
+    - c++11 := __STRICT_ANSI__, has long long type (defined in C++11)
+
+commit 6b1ef0ef99f34011da3f5383414eeedf81c59d3b
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:15 2018 -0800
+
+    open-vm-tools: fix finding C++ compiler for cross-compiling
+    
+    Patch contributed by Andrew Stormont (andy-js) on github:
+    https://github.com/vmware/open-vm-tools/pull/206 and
+    https://github.com/vmware/open-vm-tools/issues/92.
+
+commit df18c2c2c3e7dde4478ee68a5f4a96600a3d07a2
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:14 2018 -0800
+
+    Allow copying of object policy within the same container
+    
+    ObjLib_CloneExtParams is currently not allowing copying of policy from
+    parent to child/clone object on VSAN. This is because the copy policy
+    check is based on unique filesystem ID, which will be different for
+    parent and child on VSAN because they will mostly be created on same
+    container but different namespace. This change uses VCFS root instead
+    of namespace UUID to make the comparison on VSAN.
+    
+    Bonus fix: File_FullPath is now fixed to work for any combination of
+    ancestor path being present. Currently it only works if either the
+    given path exists, or when only the last component of the path does
+    not exist. And since this fix relies on finding the VCFS root of both
+    parent and child (parent is present but child is not),
+    ObjLibPathToVCFSRoot has been modified to rely on File_FullPath  in
+    addition to Util_GetCanonicalPath if the path does not exist.
+
+commit a678f3ea9f6de366b3b3de2f99956d93d2216b08
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:14 2018 -0800
+
+    Correction to previous change for Solaris11_64 GOS.
+
+commit 74eb0c942f78f775c9de2bfd0e4f9970a8cded51
+Author: Oliver Kurth <[e-mail]>
+Date:   Fri Jan 5 14:47:14 2018 -0800
+
+    Properly classify Solaris 11-64 as 64-bit
+
+commit 47e604c2dba131c13300fe15bf4ad69d5b996674
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 584aa9f307c85b07fa8adaf113e87cc3c200cca9
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 976e505b4ad5233f4eb97c7e09be63f6b0662fc7
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 96f90f19e87cfb9b1dd62d30f4b88333d973bb90
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    open-vm-tools: add missing copyright headers
+
+commit 124c6437b0fcac3e65a7748f336e8b47d9528767
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 11ff20501da5a4a4a6bcc05797b0129462cafc95
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 3dc2785d95c6b6ca42161c270fc9b3f17764ff2d
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit 525f5824a48d8856ec30250d73a99da9fea2c39f
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:21 2017 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit fe6997afdc10d3bd7396c7dea7417523851166d6
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:20 2017 -0800
+
+    Update the Tools-10.2.0 GA Open Source License Files.
+
+commit 9ac30cc60efd96556df21e87d5e8a42c7057fc95
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:20 2017 -0800
+
+    RpcVMX: Report driver name and driver version to vmx to store the key-value in
+    GuestVars, and write a log in vmware.log using RpcVMX_Log.
+
+commit 1667bc143164a6709debca423e4be0241e3275db
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:20 2017 -0800
+
+    GuestInfo: skip check for shrinkable disk when gathering disk info
+    
+    Some Linux OSes may have a non-existing device mounted to a filesystem,
+    for example Photon OS has the root file system mounted from
+    /dev/root, which does not exist. The wiper library does a check
+    for a shrinkable disk, and this fails. This change skips the check
+    when gathering data for diskinfo, but leaves it intact for
+    other disk wiper purposes. Information from read-only flesystems
+    will also be reported.
+
+commit 35b115033acb5c65e22bd4e44b90d6d69a6815c6
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:20 2017 -0800
+
+    FileIO: Add customizable privileged file opener for Apple.  The change is
+    not applicable to open-vm-tools.
+
+commit eb8456de3ddb41ecc7155c447e4bac17ca440a5d
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Dec 4 16:27:20 2017 -0800
+
+    Make AutoCPtr's constructor explicit to make it more obvious when
+    pointer ownership is transferred. (This also matches std::auto_ptr.)
+
+commit 29c40dee7848e52437b5dab2ed466771a15df13b
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Make logfiles readable only by admin/root.
+
+commit 989d96498a370034423515d3818fd02749677097
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit c4387fa58c21a0174a9cd6b053e565aea2c4870f
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit e2f15a777d241f468f5ca2bc0b608f3ecb71fc6a
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Common header files change not applicable to open-vm-tools.
+
+commit d3c3a4d3e9d97e09b07018df2dccb4b4b2c4dd1b
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Common header file change that is not applicable to open-vm-tools.
+
+commit 9a08115f6b111445f57302651f7fcb1e4f11e907
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Changes to common header files not directly applicable to open-vm-tools.
+
+commit a8f4c5ada9852dfdb251715f3785b1fee45b8f67
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Change to common header file; not applicable to open-vm-tools.
+
+commit 443f07aab7c60df74e1731127921b92447c86d61
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:04 2017 -0800
+
+    Typo correction in common header file comment.
+
+commit a5d480e471fe4e0e73f6be28ab65f6ecde64f775
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:03 2017 -0800
+
+    Improve diskinfo debug output
+    
+    Add more debug information so that it is easier to figure out why some
+    partitions are not being found.
+
+commit 08abcfc9cc08c758a8189e69e7f99ab270a2e553
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:03 2017 -0800
+
+    Make VigorPollImpl FD-based callbacks non-periodic (take 3)
+    
+    The previous attempt reveals another pre-existing issue.  An fd that is
+    closed by AsyncSocket may be reused right away.  The SharedStream for
+    that fd may still have an outstanding callback that needs to fire
+    before it would be destroyed.  If the destruction happens after the fd
+    is re-used and the new owner is using boost asio stream, the Release()
+    call would cancel the async read/write operation for the new owner.
+    One simple fix is to dup the fd when creating a SharedStream.  This
+    means hostd would need 2 fds for each running VM.  The hostd fd limit
+    is currently 4096 and I was able to power on 1K VMs.  If necessary, the
+    fd limit can be increased (the system limit is 32K).
+    
+    Previous description:
+    
+    The original change has an issue on Linux that is not observed in ESX.
+    When the read and write callbacks fire in parallel, both would release
+    the reference to the SharedStream, triggering its destructor.  Later
+    when the read callback tries to re-register itself, it would hit a
+    boost exception.  To avoid that, I delayed the reset of
+    CallbackFD::stream to the end of Invoke so that the SharedStream
+    object woudl not be destroyed as long as the callback is re-registered.
+    
+    Original description:
+    
+    The hard-to-reproduce AsyncSocket leak turns out to be a variation of
+    PR 1530561.  The fix for that bug only plugs the leak when the race is
+    between a VigorPollImpl callback that fires with an CanceledException
+    (which can be triggered by another callback registered on the same fd --
+    this is the boost behavior) and a thread trying to unregister the same
+    callback (e.g. upon detection of a disconnect).  There is still a
+    potential reference leak when the read and write callbacks run in
+    parallel, if a disconnection happens between the two asyncsocket
+    callbacks (the asyncsocket callbacks take the asyncsocket lock, so they
+    are mostly serialized).  The second asyncsocket callback handling the
+    disconnect error would unregister the first callback while the first
+    callback would be attempting to re-register itself at the VigorPollImpl
+    level (to provide the periodic behavior exposed by IVmdbPoll).  If the
+    unregister wins the race, it would return false because the callback
+    cannot be cancelled (it is running).  Then ReRegister would not find
+    the callback in the hash table, so the callback would not fire again,
+    which means the reference taken when registering the callback is leaked.
+    
+    Applying the fix for PR 1530561 in the above scenario would not work
+    because an AsycnSocket callback may unregister itself and in that case
+    the reference is appropriately released.  Unless we save the thread ID
+    in Unregister, we would not be able to distinguish when the callback
+    needs to run in order to release the reference.  After considering
+    various options, I believe trying to support periodic fd-based
+    callbacks on top of a multi-threaded poll API is troublesome.  This
+    change adds a poll flag for one-shot callbacks and used that in
+    AsyncSocket with IVmdbPoll.  VigorPollImpl only support the one-shot
+    behavior.  In the long term I would like to retire IVmdbPoll and create
+    a new poll interface.  For now I would like to minimize churn while
+    fixing the memory leak.
+
+commit 595f5add83e8fbf1ffcabd7537d294c1c9c4edfe
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:03 2017 -0800
+
+    Fix memory leak in vmtoolsd.
+
+commit 884aa32f9c9f773957275e09cd6620598185718a
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:03 2017 -0800
+
+    Tools: GuestInfo: ESX: dynamically load libvmkmemstats.so
+    
+    The new version of the vmware tools will be installed on older version
+    of ESX.  But these older versions do not come with libvmkmemstats.so
+    and a dynamic linking error occurs.
+    
+    This patch changes the code to deal with the case where the lib is not
+    available.  Instead of relying on the linker to dynamically link with
+    libvmkmemstats.so, g_module_open() is used to open the library, if
+    available, and gracefully handle any eventual errors.
+    Before the patch, the whole libguestinfo would stop working and after
+    the patch only the memory stats are unavailable.
+
+commit 6151fbafe8714c15614dd254ff8816cd28620f3c
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:03 2017 -0800
+
+    Correcting the few copyright notice added to a few CAF related files bundled in Open-VM-Tools.
+
+commit 23cfd0c0fc03c36b83c47614037f85ff98806b86
+Author: Oliver Kurth <[e-mail]>
+Date:   Thu Nov 30 15:38:03 2017 -0800
+
+    Adding copyright notice to a few CAF related files bundled in Open-VM-Tools.
+
+commit 6056c840a4a5593a3f4a87acc175b5eac3ce23dc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:36 2017 -0700
+
+    DragNDrop plugin change for VMware Tools on Windows; not applicable to
+    open-vm-tools.
+
+commit 965dbcad8680e32a8b093715b29656505a8eaf44
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:36 2017 -0700
+
+    GuestInfo: add primary-nics and low-priority-nics options
+    
+    Add the options 'primary-nics' and 'low-priority-nics' for GuestInfo.
+    
+    The options accept a list of comma separated patterns for interface names
+    which can be considered as 'primary' or 'low priority' network interfaces.
+    This will cause the NicInfo to be put on top of the list for primary
+    interfaces, and to the bottom for low priority interfaces.
+    
+    Example:
+    
+    primary-nics=eth1
+    
+    will make sure that the IP address(es) for eth1 will be sorted on
+    top of the list of IP addresses.
+    
+    primary-nics=eth*
+    
+    will make sure that any one of the addresses of all interfaces
+    matching eth* will be sorted on top of the list of IP addresses,
+    but won't guarantee which one if there is more than one.
+    
+    low-priority-nics=eth*
+    
+    will work analogously, but interfaces will be sorted to the bottom.
+    
+    In case the limit of the number of interfaces to be reported is reached,
+    low priority interfaces are the first to be skipped.
+
+commit b5c64af227b2eea0f23f2c8f3cf40c5d24c8548f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:35 2017 -0700
+
+    VGAuth changes:
+    
+     - add calling LoadUserProfile()/UnloadUserProfile() in VGAuth
+       impersonation/unimpersonation code paths
+     - VMTools side code change to use the new VGAuth SDK.
+
+commit cc18f0829bbf9d61b36f6c292a2f4fb9b9618812
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:35 2017 -0700
+
+    VGAuth changes:
+    
+     - add calling LoadUserProfile()/UnloadUserProfile() in VGAuth
+       impersonation/unimpersonation code paths
+     - VGAuth part of code change plus tools vix plugin make file.
+
+commit 4b0af4d8b889eccd0fbc18d63698c95f83be1ca3
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:35 2017 -0700
+
+    [Tools] Fix crash issue when stopping vmtoolsd(vmuser)
+    
+    When stopping vmtoolsd, the code tries to unload all plugins.  The
+    signal TOOLS_CORE_SIG_CAPABILITIES is emitted before really starting
+    to unload plugins.  If the plugin should try to call RpcChannel_Send
+    while processing the signal and the RPC channel has been shutdown, an
+    ASSERT is triggered.  The fix is to check whether rpc exists and if
+    unavailable, avoid sending the TOOLS_CORE_SIG_CAPABILITIES signal.
+
+commit 13438dc9ab2af20587e003bc7f8ba088dc2d3ed8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:35 2017 -0700
+
+    Update copyright year to 2017 for open-vm-tools 10.2.0.
+
+commit a94ed0b8af8afc7d446312c3b391f336421bd4c3
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    Add SUSE Server for SAP Applications to hostinfoPosix.c
+    
+    On SLES-SP1-SAP the "lsb_release -sd" command returns the string
+    "SUSE Linux Enterprise Server for SAP Applications 12 SP1".
+    Parsing in HostinfoGetOSShortName() detects the sub-strings "suse"
+    and "enterprise" but not "server 12".  STR_OS_SLES is returned
+    resulting in displaying of "SUSE Linux Enterprise 8/9" in the
+    summary screen of the vSphere client.  This is wrong.
+    
+    Instead, search for the sub-string "server for sap applications 12"
+    and return STR_OS_SLES_12.  SLES11-SAP is not affected.
+    
+    Please see: github.com/vmware/open-vm-tools/pull/123
+
+commit 2aba22668d4f61ddad7dff2a3e872458bf64e67a
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    lib/file: Enhance File_EnsureDirectoryEx to do more checking
+    
+    When creating a directory, distinguish whether an EEXIST error is
+    because the directory already exists or because there is a file with
+    that path name.  Return the appropriate error.
+
+commit c579e664050ddd35e975b4a7fa18beb74f2decdc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    VMware Tools 10.2.0 L10n changes for VGAuth.
+
+commit 07973b8c75feafba8c5ea400a87d0f03cdea744d
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    Common header file changed; not applicable to open-vm-tools.
+
+commit b88ff280ea0ea778ef9a4e422129bbf66291be73
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    lib/file: Reduce the create directory spam
+    
+    The lib/file primitives (e.g. create file, create directory) may fail -
+    but they also return errno/GetLastError. The caller should inspect a
+    failure and decide what to do (or log). The lib/file primitives should
+    not log. The client should do that. The primitives are the high
+    performance path and failure isn't necessarily a failure, only the
+    client can decide.
+    
+    The lib/file primitives (e.g. create file, create directory) may fail -
+    but they also return errno/GetLastError. The caller should inspect a
+    failure and decide what to do (or log). The lib/file primitives should
+    not log. The client should do that. The primitives are the high
+    performance path and failure isn't necessarily a failure, only the
+    client can decide.
+
+commit 8bdee4f53760e3a63a890653a0960c09b9258db9
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    Misc GuestOS ID fixes.
+    
+    - Centos8 64bit guest will have linux 4.x. Moved Centos8-64 guest id
+      from all3xlinux64 to all4xlinux64 guest list.
+    - oracle8_64 is missing in the list. Added it to all4xlinux64 guest list.
+    - Photon has linux 4.x. Moved photon from all3xlinux64 to all4xlinux64
+      guest list.
+    
+    - Changed the HostinfoOSData() function to return other4xlinux for
+      the distros where the version cannot be determined.
+
+commit 2ca8abc426c42e3ad7c05fd22e38ca04d6cc5e86
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    Bump imgcust version to 8.4.0.xxxx
+
+commit 921f05729bdbcb83a98ab1a28641baabd095af97
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:33 2017 -0700
+
+    Back out commit d2c18c44...: Make VigorPollImpl FD-based callbacks non-periodic
+    
+    Yet another issue is exposed by the change.  This is a clean backout
+    but keeping the cleanupOnError fix in SharedStreamFactory::Get.
+
+commit e373c1ca328f78581d915940bd7e98abdb76a089
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:32 2017 -0700
+
+    open-vm-tools: make building with gtk3 the default
+    
+    This makes building with gtk3 the default, and sets sane
+    defaults when building with/without gtk2/gtk3.
+
+commit 3455478483a6f8e810c00519b6611020e25fee83
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:32 2017 -0700
+=======
+commit 783e87e2a465d28db5233e7d1e284fa9410ffec4
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:05 2018 -0800
+
+    Remove uses of header file safetime.h
+    
+    - (many places) replace "safetime.h" with <time.h> and/or <sys/stat.h>,
+                    occasionally re-ordering this header to top of file
+    - (many places) remove "safetime.h" as no time functions are used
+
+commit bf31e9478b99b5713f2c330e48d2e40c5091d3bc
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:04 2018 -0800
+
+    Common header file change; not applicable to open-vm-tools.
+
+commit cbdbeef4b6c3454f58e9733079140edcc30fdb2a
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Feb 26 12:29:03 2018 -0800
+
+    Remove GLIBC_VERSION_NN macros
+    
+    No existing usages. Astute observers will note we currently
+    use glibc-2.5 minimum (so all but one of these macros are ALWAYS
+    defined).
+
+commit eec6e2798def2e9ff6da5e73b092cfe92e60b763
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:26 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 5170db44c1c7b814d0d2bd4131e1895dbd999db7
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:26 2018 -0800
+
+    Use a unique random temp directory for vmtoolsd on Linux.
+    
+    The temporay directory currently used by vmtoolsd and its plugins
+    on Linux is of the form /tmp/vmware-<user>.  Since it is used to
+    upload VMware Tools upgrade and GOS customization scripts and commands,
+    that name predictability may make it susceptible to attack.  This
+    change adds a new function File_GetSafeRandomTmpDir() in
+    bora/lib/file/fileTempPosix.c to both add the PID to the user name
+    and add a random number suffix to the temp directory path.
+    
+    /tmp/vmware-<user>_<pid>-nnnnnn
+    
+    VMware Tools commands and plugins are being updated to use this random
+    temp directory.
+
+commit 9bc56af5d0cb7dcc6f079ff4ab4d3456535365b2
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:26 2018 -0800
+
+    Changes to common header files not applicable to open-vm-tools.
+
+commit 3e4091698461c0a5c36f9025410941f189c5af69
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:26 2018 -0800
+
+    Fix two comment typos in hostinfoPosix.c.
+
+commit cf4f582e5b3c2df25aa775d77d458a15583a05ad
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:26 2018 -0800
+
+    open-vm-tools: ignore with/without gtk2/3 options when building without X
+    
+    When building without X support, we should ignore the options to enable/disable
+    gtk2 and gtk3. This was reported in gthub issue
+    https://github.com/vmware/open-vm-tools/issues/228 .
+
+commit 0a099c6f4949a05d1400dc147ab68ad15ebf152a
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:26 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 7be0019e01c7d473deffb8b8646fce1dff22e11a
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:25 2018 -0800
+
+    Common header file changes not applicable to open-vm-tools.
+
+commit f838807d08b9c4e72d4887642d4181dea25b6c35
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:25 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 25d00050c8009dd74e3bbcf1883fdd408411a693
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:25 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 6b6038522ed24ea134eb4e4a2752288f6f42fcd5
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Feb 7 16:39:25 2018 -0800
+
+    Header file change not applicable to open-vm-tools.
+
+commit ee4bd450c4449f8905dbca2e4759660fda5c58dc
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    fix buffer overrun in AsyncTCPSocketConnect()
+    
+    Callers may pass a struct smaller than sockaddr_storage, but a
+    sockaddr_storage-sized chunk gets copied to asock->remoteAddr.
+    memcpy() should be used.
+    
+    One such caller is AsyncSocket_ConnectUnixDomain(). It passes sockaddr_un.
+    sizeof(sockaddr_un) == 110, sizeof(sockaddr_storage) == 128.
+    
+    Caught by AddressSanitizer.
+
+commit 13df0e2fc2f68aeab0380761eb0c5ab129730710
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    open-vm-tools: use pkg-config for building with icu
+    
+    icu uses pkg-config in recent versions, and no longer ships with
+    icu-config in most recent versions. Make the configure script
+    use pkg-config for icu if available, and icu-config if not. For
+    pkg-config we need to specify 'icui18n' which returns the same result
+    as icu-config did to link with icui18n.
+
+commit 3a8221c7e4b149efacf87658ac239d815c56adba
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    Ignore ENXIO errors with SyncDriver
+    
+    A quiesced snapshot fails when the target VM has a bind mount.  The
+    problem is that the syncDriver gets an ENXIO error when it tries to
+    open the mount point.  To fix the problem, let the quiesce operation
+    skip a mount point when opening it results in an ENXIO error.
+    
+    This change is based on pull request
+    https://github.com/vmware/open-vm-tools/pull/218 .
+
+commit ff754c8a99bffe92b07c933898c7d9d20c02873f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    Refinement for memory corruption bug fix in StdIO_ReadNextLine
+
+commit 7b45a62730624c711fb4eb63a0bfd125a2befa57
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    lib/file: Style clean up in the public file.h
+
+commit 3a7dc2f92e6cb61c9ca8e57c367c972683355278
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    Common header file changes not applicable to open-vm-tools.
+
+commit c52bb302a181d4bdd0b2b61d6e901339b61d2dab
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:40 2018 -0800
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 035765d487f8ab9b2222ad239b278e4725aa5a22
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Feb 6 16:32:39 2018 -0800
 
     Changes to common header files; not applicable to open-vm-tools.
 
@@ -2320,6 +5108,7 @@ Date:   Tue Oct 24 14:07:35 2017 -0700
 commit cc18f0829bbf9d61b36f6c292a2f4fb9b9618812
 Author: Oliver Kurth <[e-mail]>
 Date:   Tue Oct 24 14:07:35 2017 -0700
+>>>>>>> open-vm-tools/ChangeLog
 
     VGAuth changes:
     
@@ -2327,6 +5116,106 @@ Date:   Tue Oct 24 14:07:35 2017 -0700
        impersonation/unimpersonation code paths
      - VGAuth part of code change plus tools vix plugin make file.
 
+<<<<<<< open-vm-tools/ChangeLog
+commit a62edfbf695ea5ad4bf8f8d91bac1740e428158f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Oct 24 14:07:32 2017 -0700
+
+    Common header file change; not directly applicable to open-vm-tools
+
+commit 009def580b00040fa6e6c07cb5743e60973973f5
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Oct 23 14:21:23 2017 -0700
+
+    GuestInfo: enable nic/iproute information for Linux without libdnet
+    
+    Linux glibc (since 2.3) fully supports getting ip addresses using
+    getifaddrs() for both IPv4 and IPv6. Use of getifaddrs() was already
+    implemented in nicInfoPosix.c for tools for ESXi. This change
+    enables that code also for Linux, if libdnet is not used.
+    
+    The change also enables the iproute information, which does not
+    depend on libdnet, except by the use of addr_stob(), which can
+    be replaced easily with the existing function CountNetmaskBits().
+
+commit 7643a1eddcc2cdc0b8a42af821ae92ca076ee37a
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Oct 23 14:21:22 2017 -0700
+
+    Make disk free space reporting consistent with Linux 'df' command.
+    
+    On Linux, statfs syscall reports free space in two fields.
+    From http://man7.org/linux/man-pages/man2/statfs.2.html:
+    1. f_bfree => Free blocks in filesystem
+    2. f_bavail => Free blocks available to unprivileged user
+    
+    For file systems that maintain reserved space for system
+    activities f_bfree > f_bavail because f_bfree includes the
+    reserved space in the file system. The reserved space is
+    typically 5% for 'ext4' file systems. Newer distros like
+    RHEL 7.x use 'xfs' by default and report same value for
+    both the fields.
+    
+    The Linux 'df' command uses f_bavail in its reporting.
+    Tools reports, conditionally, f_bfree for root and f_bavail
+    for non-root.  However, since vmtoolsd runs as root, Tools
+    always reports f_bfree, which is more free space than 'df'
+    would report (depending on amount of reserved space).
+    
+    In order to be consistent with Linux 'df' command,
+    report f_bavail as the disk free space by default. This does
+    change the behavior a little bit in that Tools will report less
+    disk free space than before, the difference being the same as
+    the reserved space on the file system, typically 5%. This
+    should be OK in general because it makes the space reporting
+    a bit conservative. If this change in behavior is not desired
+    for some use cases, the old behavior can be restored by setting
+    the following newly added configuration in this change:
+    
+    [guestinfo]
+    diskinfo-include-reserved=true
+    
+    The existing callers that are outside the guestInfo plugin
+    will continue to include reserved space in their space
+    accounting as before.
+    
+    Also fixed a few minor stuff/touchups in vmtoolsConfig.c.
+
+commit ff6daf51be641a805f94fa11415e032bad3ef48a
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Oct 23 14:21:22 2017 -0700
+
+    Porting some common code to another architecture; not applicable to
+    open-vm-tools.
+
+commit a1d4afc447091d9fbccf89be6561accfc1e33aa9
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Oct 23 14:21:22 2017 -0700
+
+    Add support to tools timeSync to issue w32tm resync in Windows guests.
+    
+    This change adds support to issue a w32tm resync command from within
+    VMware tools timeSync in order to reconfigure w32time configuration
+    parameters. This forces guest time to be resynchronized to external
+    time server.
+
+commit d2c18c44df3fbc410e04b2f1b2595a326a52afec
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Oct 23 14:21:22 2017 -0700
+
+    Add a poll flag for one-shot callbacks in AsyncSocket
+    
+    The original change had an issue.  When the read and write callbacks
+    fire in parallel, both would release the reference to the SharedStream,
+    triggering its destructor.  Later when the read callback tried to
+    re-register itself, it would hit a boost exception.  To avoid that,
+    delay the reset of CallbackFD::stream to the end of Invoke so that the
+    SharedStream object will not be destroyed as long as the callback is
+    re-registered.
+
+commit 485dc67e56ad68e05d4106059594279f67dd119b
+Author: Oliver Kurth <[e-mail]>
+=======
 commit 4b0af4d8b889eccd0fbc18d63698c95f83be1ca3
 Author: Oliver Kurth <[e-mail]>
 Date:   Tue Oct 24 14:07:35 2017 -0700
@@ -2549,6 +5438,7 @@ Date:   Mon Oct 23 14:21:22 2017 -0700
 
 commit 485dc67e56ad68e05d4106059594279f67dd119b
 Author: Oliver Kurth <[e-mail]>
+>>>>>>> open-vm-tools/ChangeLog
 Date:   Mon Oct 23 14:21:22 2017 -0700
 
     Change to shared header file unrelated to open-vm-tools.
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 72dc4ff..e952cff 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -35,10 +35,17 @@
 ### Initialization
 ###
 
+<<<<<<< open-vm-tools/configure.ac
 TOOLS_VERSION="10.3.0"
 AC_INIT(
    [open-vm-tools],
    [10.3.0],
+=======
+TOOLS_VERSION="10.3.5"
+AC_INIT(
+   [open-vm-tools],
+   [10.3.5],
+>>>>>>> open-vm-tools/configure.ac
    [[e-mail]])
 
 # In order to make this configure script auto-detect situations where
@@ -1370,9 +1377,6 @@ if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then
    if test "$osVersion" -ge 302000; then
       MODULES="$MODULES vmmemctl"
    fi
-   if test "$osVersion" -ge 409000; then
-      MODULES="$MODULES vmxnet"
-   fi
    if test "$osVersion" -ge 600000; then
       MODULES="$MODULES vmblock"
    fi
diff --git a/open-vm-tools/lib/file/file.c b/open-vm-tools/lib/file/file.c
index 6053247..2d1154b 100644
--- a/open-vm-tools/lib/file/file.c
+++ b/open-vm-tools/lib/file/file.c
@@ -1863,7 +1863,7 @@ FileDeleteDirectoryTree(const char *pathName,  // IN: directory to delete
    char *base;
 
    char **fileList = NULL;
-   Bool sawFileError = FALSE;
+   Err_Number fileError = 0;
 
    if (Posix_EuidAccess(pathName, F_OK) != 0) {
       /*
@@ -1909,7 +1909,7 @@ FileDeleteDirectoryTree(const char *pathName,  // IN: directory to delete
          case S_IFDIR:
             /* Directory, recurse */
             if (!FileDeleteDirectoryTree(curPath, FALSE)) {
-               sawFileError = TRUE;
+               fileError = Err_Errno();
             }
             break;
 
@@ -1917,7 +1917,7 @@ FileDeleteDirectoryTree(const char *pathName,  // IN: directory to delete
          case S_IFLNK:
             /* Delete symlink, not what it points to */
             if (FileDeletion(curPath, FALSE) != 0) {
-               sawFileError = TRUE;
+               fileError = Err_Errno();
             }
             break;
 #endif
@@ -1927,19 +1927,21 @@ FileDeleteDirectoryTree(const char *pathName,  // IN: directory to delete
 #if defined(_WIN32)
                if (File_SetFilePermissions(curPath, S_IWUSR)) {
                   if (FileDeletion(curPath, FALSE) != 0) {
-                     sawFileError = TRUE;
+                     fileError = Err_Errno();
                   }
                } else {
-                  sawFileError = TRUE;
+                  fileError = Err_Errno();
                }
 #else
-               sawFileError = TRUE;
+               fileError = Err_Errno();
 #endif
             }
             break;
          }
       } else {
-         sawFileError = TRUE;
+         fileError = Err_Errno();
+         Log(LGPFX" %s: Lstat of '%s' failed, errno = %d\n",
+             __FUNCTION__, curPath, errno);
       }
 
       Posix_Free(curPath);
@@ -1952,14 +1954,16 @@ FileDeleteDirectoryTree(const char *pathName,  // IN: directory to delete
        * Call File_DeleteEmptyDirectory() only if there is no prior error
        * while deleting the children.
        */
-      if (!sawFileError && !File_DeleteEmptyDirectory(pathName)) {
-         sawFileError = TRUE;
+      if (fileError == 0 && !File_DeleteEmptyDirectory(pathName)) {
+         fileError = Err_Errno();
       }
    }
 
    Util_FreeStringList(fileList, numFiles);
 
-   return !sawFileError;
+   Err_SetErrno(fileError);
+
+   return fileError == 0;
 }
 
 
diff --git a/open-vm-tools/lib/glibUtils/fileLogger.c b/open-vm-tools/lib/glibUtils/fileLogger.c
index af1cb8a..98d5bb5 100644
--- a/open-vm-tools/lib/glibUtils/fileLogger.c
+++ b/open-vm-tools/lib/glibUtils/fileLogger.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2010-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -299,11 +299,26 @@ FileLoggerOpen(FileLogger *data)
    }
 
    logfile = g_io_channel_new_file(path, data->append ? "a" : "w", NULL);
-   g_free(path);
 
    if (logfile != NULL) {
       g_io_channel_set_encoding(logfile, NULL, NULL);
+#ifdef VMX86_TOOLS
+      /*
+       * Make the logfile readable only by user and root/administrator.
+       */
+#ifdef _WIN32
+      /*
+       * XXX TODO: Set the ACLs properly for Windows.
+       */
+#else
+      /*
+       * Can't do anything if it fails, so ignore return.
+       */
+      (void) chmod(path, 0600);
+#endif
+#endif // VMX86_TOOLS
    }
+   g_free(path);
 
    return logfile;
 }
diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index bcde636..7ea3b7f 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -7246,8 +7246,8 @@ HgfsValidateRenameFile(Bool useHandle,            // IN:
       if (HGFS_ERROR_SUCCESS != status) {
          LOG(4, ("%s: could not map cached handle %d, error %u\n",
                  __FUNCTION__, fileHandle, status));
-      } else if (!HgfsHandle2FileNameMode(fileHandle, session, &shareInfo->writePermissions,
-                                          &shareInfo->readPermissions, localFileName,
+      } else if (!HgfsHandle2FileNameMode(fileHandle, session, &shareInfo->readPermissions,
+                                          &shareInfo->writePermissions, localFileName,
                                           localNameLength)) {
          /*
           * HgfsPlatformRename requires valid source file name even when file handle
diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
index c4f7c89..f2b7ce6 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -4583,8 +4583,8 @@ HgfsPlatformDeleteFileByHandle(HgfsHandle file,          // IN: File being delet
    char *localName;
    size_t localNameSize;
 
-   if (HgfsHandle2FileNameMode(file, session, &writePermissions,
-                               &readPermissions, &localName, &localNameSize)) {
+   if (HgfsHandle2FileNameMode(file, session, &readPermissions, &writePermissions,
+                               &localName, &localNameSize)) {
       if (writePermissions && readPermissions) {
          status = HgfsPlatformDeleteFileByName(localName);
       } else {
@@ -4665,8 +4665,8 @@ HgfsPlatformDeleteDirByHandle(HgfsHandle file,          // IN: File being delete
    char *localName;
    size_t localNameSize;
 
-   if (HgfsHandle2FileNameMode(file, session, &writePermissions,
-                               &readPermissions, &localName, &localNameSize)) {
+   if (HgfsHandle2FileNameMode(file, session, &readPermissions, &writePermissions,
+                               &localName, &localNameSize)) {
       if (writePermissions && readPermissions) {
          status = HgfsPlatformDeleteDirByName(localName);
       } else {
diff --git a/open-vm-tools/lib/include/buildNumber.h b/open-vm-tools/lib/include/buildNumber.h
index c0a903a..80245f1 100644
--- a/open-vm-tools/lib/include/buildNumber.h
+++ b/open-vm-tools/lib/include/buildNumber.h
@@ -1,4 +1,5 @@
 #define BUILD_NUMBER \
+<<<<<<< open-vm-tools/lib/include/buildNumber.h
 	"build-8931395"
 #define BUILD_NUMBER_NUMERIC \
 	8931395
@@ -10,3 +11,16 @@
 	5330
 #define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
 	"5330"
+=======
+	"build-10430147"
+#define BUILD_NUMBER_NUMERIC \
+	10430147
+#define BUILD_NUMBER_NUMERIC_STRING \
+	"10430147"
+#define PRODUCT_BUILD_NUMBER \
+	"product-build-7752"
+#define PRODUCT_BUILD_NUMBER_NUMERIC \
+	7752
+#define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
+	"7752"
+>>>>>>> open-vm-tools/lib/include/buildNumber.h
diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index af68534..f9698c1 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -171,6 +171,32 @@
 
 /*
  ******************************************************************************
+ * BEGIN GuestOSInfo goodies.
+ */
+
+/**
+ * Defines the string used for the GuestOSInfo config file group.
+ */
+#define CONFGROUPNAME_GUESTOSINFO "guestosinfo"
+
+/**
+ * Lets users override the short OS name sent by Tools.
+ */
+#define CONFNAME_GUESTOSINFO_SHORTNAME "short-name"
+
+/**
+ * Lets users override the long OS name sent by Tools.
+ */
+#define CONFNAME_GUESTOSINFO_LONGNAME "long-name"
+
+/*
+ * END GuestOSInfo goodies.
+ ******************************************************************************
+ */
+
+
+/*
+ ******************************************************************************
  * BEGIN Unity goodies.
  */
 
diff --git a/open-vm-tools/lib/include/err.h b/open-vm-tools/lib/include/err.h
index b692db4..65b45a5 100644
--- a/open-vm-tools/lib/include/err.h
+++ b/open-vm-tools/lib/include/err.h
@@ -122,6 +122,7 @@ char *Err_SanitizeMessage(const char *msg);
  */
 
 #if defined(_WIN32)
+<<<<<<< open-vm-tools/lib/include/err.h
 #define WITH_ERRNO(e, body) do { \
       Err_Number e = Err_Errno(); \
       int __win__##e = errno; \
@@ -130,12 +131,29 @@ char *Err_SanitizeMessage(const char *msg);
       errno = __win__##e; \
    } while (0)
 #else
+=======
+>>>>>>> open-vm-tools/lib/include/err.h
 #define WITH_ERRNO(e, body) do { \
       Err_Number e = Err_Errno(); \
+      int __win__##e = errno; \
       body; \
       Err_SetErrno(e); \
+<<<<<<< open-vm-tools/lib/include/err.h
    } while (0)
 #endif
+=======
+      errno = __win__##e; \
+   } while (0)
+#else
+#define WITH_ERRNO(e, body) do { \
+      Err_Number e = Err_Errno(); \
+      body; \
+      Err_SetErrno(e); \
+   } while (0)
+#endif
+
+#define WITH_ERRNO_FREE(p) WITH_ERRNO(__errNum__, free((void *)p))
+>>>>>>> open-vm-tools/lib/include/err.h
 
 #if defined(__cplusplus)
 }  // extern "C"
diff --git a/open-vm-tools/lib/include/ioplGet.h b/open-vm-tools/lib/include/ioplGet.h
index bcecf9b..2ebe8aa 100644
--- a/open-vm-tools/lib/include/ioplGet.h
+++ b/open-vm-tools/lib/include/ioplGet.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2012-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2012-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#define Iopl_Get() ((GetCallerEFlags() >> EFLAGS_IOPL_SHIFT) && 0x3)
+#define Iopl_Get() ((GetCallerEFlags() >> EFLAGS_IOPL_SHIFT) & 0x3)
 
 #if defined(__cplusplus)
 }  // extern "C"
diff --git a/open-vm-tools/lib/include/posix.h b/open-vm-tools/lib/include/posix.h
index 4a643f0..b5ae883 100644
--- a/open-vm-tools/lib/include/posix.h
+++ b/open-vm-tools/lib/include/posix.h
@@ -35,6 +35,7 @@
 #include "unicodeTypes.h"
 #include "unicodeBase.h"
 #include "codeset.h"
+#include "err.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -125,14 +126,7 @@ char *Posix_MkTemp(const char *pathName);
  *-----------------------------------------------------------------------------
  */
 
-static INLINE void
-Posix_Free(void *p)  // IN
-{
-   int err = errno;
-   free(p);
-   errno = err;
-}
-
+#define Posix_Free(p) WITH_ERRNO_FREE(p)
 
 #if !defined(_WIN32)
 /*
diff --git a/open-vm-tools/lib/include/rpcin.h b/open-vm-tools/lib/include/rpcin.h
index 64b8155..5f06546 100644
--- a/open-vm-tools/lib/include/rpcin.h
+++ b/open-vm-tools/lib/include/rpcin.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -33,6 +33,8 @@ extern "C" {
 
 typedef void RpcIn_ErrorFunc(void *clientData, char const *status);
 
+typedef void RpcIn_ClearErrorFunc(void *clientData);
+
 typedef struct RpcIn RpcIn;
 
 #if defined(VMTOOLS_USE_GLIB) /* { */
@@ -44,7 +46,9 @@ RpcIn *RpcIn_Construct(GMainContext *mainCtx,
                        gpointer clientData);
 
 Bool RpcIn_start(RpcIn *in, unsigned int delay,
-                 RpcIn_ErrorFunc *errorFunc, void *errorData);
+                 RpcIn_ErrorFunc *errorFunc,
+                 RpcIn_ClearErrorFunc *clearErrorFunc,
+                 void *errorData);
 
 #else /* } { */
 
@@ -66,7 +70,10 @@ RpcIn *RpcIn_Construct(DblLnkLst_Links *eventQueue);
 
 Bool RpcIn_start(RpcIn *in, unsigned int delay,
                  RpcIn_Callback resetCallback, void *resetClientData,
-                 RpcIn_ErrorFunc *errorFunc, void *errorData);
+                 RpcIn_ErrorFunc *errorFunc,
+                 RpcIn_ClearErrorFunc *clearErrorFunc,
+                 void *errorData);
+
 
 /*
  * Don't use this function anymore - it's here only for backwards compatibility.
diff --git a/open-vm-tools/lib/include/unicodeBase.h b/open-vm-tools/lib/include/unicodeBase.h
index b79c6c8..39cf4ec 100644
--- a/open-vm-tools/lib/include/unicodeBase.h
+++ b/open-vm-tools/lib/include/unicodeBase.h
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include "util.h"
 #include "unicodeTypes.h"
+#include "err.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -348,11 +349,15 @@ const char *Unicode_GetStatic(const char *asciiBytes,
  */
 #if defined(_WIN32)
    #define UNICODE_GET_UTF16(s)     Unicode_GetAllocUTF16(s)
+<<<<<<< open-vm-tools/lib/include/unicodeBase.h
    #define UNICODE_RELEASE_UTF16(s) do { \
          int err = errno; \
          free((utf16_t *)s); \
          errno = err; \
       } while (0)
+=======
+   #define UNICODE_RELEASE_UTF16(s) WITH_ERRNO_FREE(s)
+>>>>>>> open-vm-tools/lib/include/unicodeBase.h
 #endif
 
 #if defined(__cplusplus)
diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index d9ef05e..372ab75 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 231c4e5..f2870b1 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -57,7 +57,11 @@
    #define PRODUCT_VERSION    14,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_SYSIMAGE)
    // SYSIMAGE_VERSION below has to match this
+<<<<<<< open-vm-tools/lib/include/vm_product_versions.h
    #define PRODUCT_VERSION    8,4,0,PRODUCT_BUILD_NUMBER_NUMERIC
+=======
+   #define PRODUCT_VERSION    8,4,1,PRODUCT_BUILD_NUMBER_NUMERIC
+>>>>>>> open-vm-tools/lib/include/vm_product_versions.h
 #else
    /* Generic catch-all. */
    #define PRODUCT_VERSION    0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -177,7 +181,11 @@
 #define FUSION_VERSION "e.x.p"
 
 // These must match PRODUCT_VERSION for VMX86_SYSIMAGE above
+<<<<<<< open-vm-tools/lib/include/vm_product_versions.h
 #define SYSIMAGE_VERSION "8.4.0"
+=======
+#define SYSIMAGE_VERSION "8.4.1"
+>>>>>>> open-vm-tools/lib/include/vm_product_versions.h
 #define SYSIMAGE_VERSION_EXT_STR \
    SYSIMAGE_VERSION "." PRODUCT_BUILD_NUMBER_NUMERIC_STRING
 
@@ -260,7 +268,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 +363,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
diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index cbdc9bc..eda794d 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1481,9 +1481,22 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_JACKHAMMER_RELEASE_V_MNR  3
 #define   TOOLS_VERSION_JACKHAMMER_RELEASE_V_BASE 0
 
+<<<<<<< open-vm-tools/lib/include/vm_tools_version.h
 #define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_JACKHAMMER_RELEASE
 #define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_JACKHAMMER_RELEASE)
 #define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_JACKHAMMER_RELEASE)
+=======
+#ifndef RC_INVOKED
+#define   TOOLS_VERSION_JACKHAMMER_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_JACKHAMMER_UPDATE1_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_JACKHAMMER_UPDATE1_V_MJR  10
+#define   TOOLS_VERSION_JACKHAMMER_UPDATE1_V_MNR  3
+#define   TOOLS_VERSION_JACKHAMMER_UPDATE1_V_BASE 5
+
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_JACKHAMMER_UPDATE1
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_JACKHAMMER_UPDATE1)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_JACKHAMMER_UPDATE1)
+>>>>>>> open-vm-tools/lib/include/vm_tools_version.h
 
 /*
  * The extended Tools version is the current Tools version with the
diff --git a/open-vm-tools/lib/include/vmware/tools/guestrpc.h b/open-vm-tools/lib/include/vmware/tools/guestrpc.h
index e6fee26..659fd20 100644
--- a/open-vm-tools/lib/include/vmware/tools/guestrpc.h
+++ b/open-vm-tools/lib/include/vmware/tools/guestrpc.h
@@ -125,6 +125,15 @@ typedef void (*RpcChannelResetCb)(RpcChannel *chan,
                                   gboolean success,
                                   gpointer data);
 
+/**
+ * Signature for the application callback function when unable to establish
+ * an RpcChannel connection.
+ *
+ * @param[in]  _state     Client data.
+ */
+typedef void (*RpcChannelFailureCb)(gpointer _state);
+
+
 gboolean
 RpcChannel_Start(RpcChannel *chan);
 
@@ -160,7 +169,9 @@ RpcChannel_Setup(RpcChannel *chan,
                  GMainContext *mainCtx,
                  gpointer appCtx,
                  RpcChannelResetCb resetCb,
-                 gpointer resetData);
+                 gpointer resetData,
+                 RpcChannelFailureCb failureCb,
+                 guint maxFailures);
 
 void
 RpcChannel_RegisterCallback(RpcChannel *chan,
diff --git a/open-vm-tools/lib/misc/vthreadBase.c b/open-vm-tools/lib/misc/vthreadBase.c
index 328a37c..350d4e3 100644
--- a/open-vm-tools/lib/misc/vthreadBase.c
+++ b/open-vm-tools/lib/misc/vthreadBase.c
@@ -481,8 +481,15 @@ VThreadBase_SetName(const char *name)  // IN: new name
    }
 
 #if defined VMW_HAVE_TLS
-   /* Never copy last byte; this ensures NUL-term is always present */
+   /*
+    * Never copy last byte; this ensures NUL-term is always present.
+    * The NUL-term is always present because vthreadName is static,
+    * but gcc-8 generates a warning if it doesn't see it being explicilty
+    * set.
+    */
+
    strncpy(vthreadName, name, sizeof vthreadName - 1);
+   vthreadName[sizeof vthreadName - 1] = '\0';
 #else
    do {
       char *buf;
diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
index 8a063a0..a22981d 100644
--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
@@ -277,6 +277,22 @@ GuestInfoGetInterface(struct ifaddrs *ifaddrs,
 
       if (sll != NULL && sll->sll_family == AF_PACKET) {
          char macAddress[NICINFO_MAC_LEN];
+
+         /*
+          * PR 2193804:
+          * On ESXi, AF_PACKET family is reported for vmk* interfaces only
+          * and its ifa_flags is reported as 0. No AF_PACKET family ifaddrs
+          * is reported for loopback interface.
+          */
+#if !defined(USERWORLD)
+         /*
+          * Ignore loopback and downed devices.
+          */
+         if (!(pkt->ifa_flags & IFF_UP) || pkt->ifa_flags & IFF_LOOPBACK) {
+            continue;
+         }
+#endif
+
          Str_Sprintf(macAddress, sizeof macAddress,
                      "%02x:%02x:%02x:%02x:%02x:%02x",
                      sll->sll_addr[0], sll->sll_addr[1], sll->sll_addr[2],
@@ -301,6 +317,8 @@ GuestInfoGetInterface(struct ifaddrs *ifaddrs,
                unsigned nBits = 0;
                /*
                 * Ignore any loopback addresses.
+                * A loopback address would indicate a misconfiguration, since
+                * this is not a loopback device (we checked for that above).
                 */
                if (family == AF_INET) {
                   struct sockaddr_in *sin = (struct sockaddr_in *)sa;
diff --git a/open-vm-tools/lib/rpcChannel/rpcChannel.c b/open-vm-tools/lib/rpcChannel/rpcChannel.c
index e6c7e0d..d0903f8 100644
--- a/open-vm-tools/lib/rpcChannel/rpcChannel.c
+++ b/open-vm-tools/lib/rpcChannel/rpcChannel.c
@@ -52,7 +52,19 @@ typedef struct RpcChannelInt {
    RpcChannelResetCb       resetCb;
    gpointer                resetData;
    gboolean                rpcError;
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
    guint                   rpcErrorCount;
+=======
+   guint                   rpcResetErrorCount;  /* channel reset failures */
+   /*
+    * The rpcFailureCount is a cumulative count of calls made to
+    * RpcChannelError().  When getting repeated channel failures,
+    * the channel is constantly stopped and restarted.
+    */
+   guint                   rpcFailureCount;  /* cumulative channel failures */
+   RpcChannelFailureCb     rpcFailureCb;
+   guint                   rpcMaxFailures;
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 #endif
 } RpcChannelInt;
 
@@ -122,7 +134,7 @@ RpcChannelRestart(gpointer _chan)
    chanStarted = RpcChannel_Start(&chan->impl);
    g_static_mutex_unlock(&chan->impl.outLock);
    if (!chanStarted) {
-      Warning("Channel restart failed [%d]\n", chan->rpcErrorCount);
+      Warning("Channel restart failed [%d]\n", chan->rpcResetErrorCount);
       if (chan->resetCb != NULL) {
          chan->resetCb(&chan->impl, FALSE, chan->resetData);
       }
@@ -153,9 +165,9 @@ RpcChannelCheckReset(gpointer _chan)
    if (chan->rpcError) {
       GSource *src;
 
-      if (++(chan->rpcErrorCount) > channelTimeoutAttempts) {
+      if (++(chan->rpcResetErrorCount) > channelTimeoutAttempts) {
          Warning("Failed to reset channel after %u attempts\n",
-                 chan->rpcErrorCount - 1);
+                 chan->rpcResetErrorCount - 1);
          if (chan->resetCb != NULL) {
             chan->resetCb(&chan->impl, FALSE, chan->resetData);
          }
@@ -163,7 +175,7 @@ RpcChannelCheckReset(gpointer _chan)
       }
 
       /* Schedule the channel restart for 1 sec in the future. */
-      Debug(LGPFX "Resetting channel [%u]\n", chan->rpcErrorCount);
+      Debug(LGPFX "Resetting channel [%u]\n", chan->rpcResetErrorCount);
       src = g_timeout_source_new(1000);
       g_source_set_callback(src, RpcChannelRestart, chan, NULL);
       g_source_attach(src, chan->mainCtx);
@@ -173,7 +185,7 @@ RpcChannelCheckReset(gpointer _chan)
 
    /* Reset was successful. */
    Debug(LGPFX "Channel was reset successfully.\n");
-   chan->rpcErrorCount = 0;
+   chan->rpcResetErrorCount = 0;
    Debug(LGPFX "Clearing backdoor behavior ...\n");
    gVSocketFailed = FALSE;
 
@@ -428,6 +440,11 @@ exit:
  * @param[in]  appCtx      Application context.
  * @param[in]  resetCb     Callback for when a reset occurs.
  * @param[in]  resetData   Client data for the reset callback.
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
+=======
+ * @param[in]  failureCB   Callback for when the channel failure limit is hit.
+ * @param[in]  maxFailures Maximum channel failures allowed.
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
  */
 
 void
@@ -436,7 +453,13 @@ RpcChannel_Setup(RpcChannel *chan,
                  GMainContext *mainCtx,
                  gpointer appCtx,
                  RpcChannelResetCb resetCb,
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
                  gpointer resetData)
+=======
+                 gpointer resetData,
+                 RpcChannelFailureCb failureCb,
+                 guint maxFailures)
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 {
    size_t i;
    RpcChannelInt *cdata = (RpcChannelInt *) chan;
@@ -446,6 +469,11 @@ RpcChannel_Setup(RpcChannel *chan,
    cdata->mainCtx = g_main_context_ref(mainCtx);
    cdata->resetCb = resetCb;
    cdata->resetData = resetData;
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
+=======
+   cdata->rpcFailureCb = failureCb;
+   cdata->rpcMaxFailures = maxFailures;
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 
    cdata->resetReg.name = "reset";
    cdata->resetReg.callback = RpcChannelReset;
@@ -486,6 +514,13 @@ RpcChannel_RegisterCallback(RpcChannel *chan,
    ASSERT(rpc->xdrIn == NULL || rpc->xdrInSize > 0);
    if (cdata->rpcs == NULL) {
       cdata->rpcs = g_hash_table_new(g_str_hash, g_str_equal);
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
+   }
+   if (g_hash_table_lookup(cdata->rpcs, rpc->name) != NULL) {
+      Panic("Trying to overwrite existing RPC registration for %s!\n", rpc->name);
+   }
+   g_hash_table_insert(cdata->rpcs, (gpointer) rpc->name, rpc);
+=======
    }
    if (g_hash_table_lookup(cdata->rpcs, rpc->name) != NULL) {
       Panic("Trying to overwrite existing RPC registration for %s!\n", rpc->name);
@@ -510,6 +545,43 @@ RpcChannel_UnregisterCallback(RpcChannel *chan,
    if (cdata->rpcs != NULL) {
       g_hash_table_remove(cdata->rpcs, rpc->name);
    }
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
+}
+
+
+/**
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
+ * Unregisters a new RPC handler from the given RPC channel. This function is
+ * not thread-safe.
+ *
+ * @param[in]  chan     The channel instance.
+ * @param[in]  rpc      Info about the RPC being unregistered.
+ */
+
+void
+RpcChannel_UnregisterCallback(RpcChannel *chan,
+                              RpcChannelCallback *rpc)
+{
+   RpcChannelInt *cdata = (RpcChannelInt *) chan;
+   if (cdata->rpcs != NULL) {
+      g_hash_table_remove(cdata->rpcs, rpc->name);
+   }
+=======
+ * Callback function to clear the cumulative channel error count when RpcIn
+ * is able to establish a working connection following an error or reset.
+ *
+ * @param[in]  _chan       The RPC channel.
+ */
+
+static void
+RpcChannelClearError(void *_chan)
+{
+   RpcChannelInt *chan = _chan;
+
+   Debug(LGPFX " %s: Clearing cumulative RpcChannel error count; was %d\n",
+         __FUNCTION__, chan->rpcFailureCount);
+   chan->rpcFailureCount = 0;
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 }
 
 
@@ -523,16 +595,36 @@ RpcChannel_UnregisterCallback(RpcChannel *chan,
 
 static void
 RpcChannelError(void *_chan,
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
                  char const *status)
+=======
+                char const *status)
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 {
    RpcChannelInt *chan = _chan;
+
    chan->rpcError = TRUE;
+
    /*
     * XXX: Workaround for PR 935520.
     * Revert the log call to Warning() after fixing PR 955746.
     */
    Debug(LGPFX "Error in the RPC receive loop: %s.\n", status);
 
+   /*
+    * If an RPC failure callback has been registered and the failure limit
+    * check has not been suppressed, check whether the RpcChannel failure
+    * limit has been reached.
+    */
+   if (chan->rpcFailureCb != NULL &&
+       chan->rpcMaxFailures > 0 &&
+       ++chan->rpcFailureCount >= chan->rpcMaxFailures) {
+      /* Maximum number of channel errors has been reached. */
+      Warning(LGPFX "RpcChannel failure count %d; calling the failure "
+                    "callback function.\n", chan->rpcFailureCount);
+      chan->rpcFailureCb(chan->resetData);
+   }
+
    if (chan->resetCheck == NULL) {
       chan->resetCheck = g_idle_source_new();
       g_source_set_callback(chan->resetCheck, RpcChannelCheckReset, chan, NULL);
@@ -556,6 +648,25 @@ RpcChannelError(void *_chan,
 
 RpcChannel *
 RpcChannel_Create(void)
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
+{
+   RpcChannelInt *chan = g_new0(RpcChannelInt, 1);
+   return &chan->impl;
+}
+
+
+/**
+ * Shuts down an RPC channel and release any held resources.
+ *
+ * @param[in]  chan     The RPC channel.
+ *
+ * @return  Whether the channel was shut down successfully.
+ */
+
+gboolean
+RpcChannel_Destroy(RpcChannel *chan)
+{
+=======
 {
    RpcChannelInt *chan = g_new0(RpcChannelInt, 1);
    return &chan->impl;
@@ -573,6 +684,7 @@ RpcChannel_Create(void)
 gboolean
 RpcChannel_Destroy(RpcChannel *chan)
 {
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 #if defined(NEED_RPCIN)
    size_t i;
 #endif
@@ -596,6 +708,10 @@ RpcChannel_Destroy(RpcChannel *chan)
    cdata->resetCb = NULL;
    cdata->resetData = NULL;
    cdata->appCtx = NULL;
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
+=======
+   cdata->rpcFailureCb = NULL;
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
 
    g_free(cdata->appName);
    cdata->appName = NULL;
@@ -771,7 +887,12 @@ RpcChannel_Start(RpcChannel *chan)
 
 #if defined(NEED_RPCIN)
    if (chan->in != NULL && !chan->inStarted) {
+<<<<<<< open-vm-tools/lib/rpcChannel/rpcChannel.c
       ok = RpcIn_start(chan->in, RPCIN_MAX_DELAY, RpcChannelError, chan);
+=======
+      ok = RpcIn_start(chan->in, RPCIN_MAX_DELAY, RpcChannelError,
+                       RpcChannelClearError, chan);
+>>>>>>> open-vm-tools/lib/rpcChannel/rpcChannel.c
       chan->inStarted = ok;
    }
 #endif
diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c
index c2c5158..8eea7d8 100644
--- a/open-vm-tools/lib/rpcIn/rpcin.c
+++ b/open-vm-tools/lib/rpcIn/rpcin.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -178,6 +178,13 @@ struct RpcIn {
     */
    Bool inLoop;     // RpcInLoop is running.
    Bool shouldStop; // Stop the channel the next time RpcInLoop exits.
+
+   /*
+    * RpcInConnErrorHandler called; cleared when a non "reset" reply has been
+    * received.
+    */
+   Bool errStatus;
+   RpcIn_ClearErrorFunc *clearErrorFunc;
 };
 
 static Bool RpcInSend(RpcIn *in, int flags);
@@ -1070,6 +1077,8 @@ RpcInConnErrorHandler(int err,             // IN
    Debug("RpcIn: Error in socket %d, closing connection: %s.\n",
          AsyncSocket_GetFd(asock), AsyncSocket_Err2String(err));
 
+   in->errStatus = TRUE;
+
    if (conn->connected) {
       RpcInCloseChannel(conn->in, errmsg);
    } else { /* the connection never gets connected */
@@ -1490,6 +1499,26 @@ exit:
 
 
 /*
+ * RpcInClearErrorStatus --
+ *
+ *      Clear the errStatus indicator and if a callback has been registered,
+ *      notify the RpcChannel layer that an error condition has been cleared.
+ */
+
+static void
+RpcInClearErrorStatus(RpcIn *in) // IN
+{
+   if (in->errStatus) {
+      Debug("RpcIn: %s: Clearing errStatus\n", __FUNCTION__);
+      in->errStatus = FALSE;
+      if (in->clearErrorFunc != NULL) {
+         in->clearErrorFunc(in->errorData);
+      }
+   }
+}
+
+
+/*
  *-----------------------------------------------------------------------------
  *
  * RpcInLoop --
@@ -1569,6 +1598,12 @@ RpcInLoop(void *clientData) // IN
    if (repLen) {
       char *s = ByteDump(reply, repLen);
       Debug("RpcIn: received %d bytes, content:\"%s\"\n", (int) repLen, s);
+
+      /* If reply is not a "reset", the channel is functioning. */
+      if (in->errStatus && strcmp(s, "reset") != 0) {
+         RpcInClearErrorStatus(in);
+      }
+
       if (!RpcInExecRpc(in, reply, repLen, &errmsg)) {
          goto error;
       }
@@ -1584,6 +1619,11 @@ RpcInLoop(void *clientData) // IN
          lastPrintMilli = now;
       }
 
+      /* RpcIn connection is working - receiving. */
+      if (in->errStatus) {
+         RpcInClearErrorStatus(in);
+      }
+
       /*
        * Nothing to execute
        */
@@ -1792,18 +1832,21 @@ error:
 
 #if defined(VMTOOLS_USE_GLIB)
 Bool
-RpcIn_start(RpcIn *in,                    // IN
-            unsigned int delay,           // IN
-            RpcIn_ErrorFunc *errorFunc,   // IN
-            void *errorData)              // IN
+RpcIn_start(RpcIn *in,                                // IN
+            unsigned int delay,                       // IN
+            RpcIn_ErrorFunc *errorFunc,               // IN
+            RpcIn_ClearErrorFunc *clearErrorFunc,     // IN
+            void *errorData)                          // IN
+
 #else
 Bool
-RpcIn_start(RpcIn *in,                    // IN
-            unsigned int delay,           // IN
-            RpcIn_Callback resetCallback, // IN
-            void *resetClientData,        // IN
-            RpcIn_ErrorFunc *errorFunc,   // IN
-            void *errorData)              // IN
+RpcIn_start(RpcIn *in,                                // IN
+            unsigned int delay,                       // IN
+            RpcIn_Callback resetCallback,             // IN
+            void *resetClientData,                    // IN
+            RpcIn_ErrorFunc *errorFunc,               // IN
+            RpcIn_ClearErrorFunc *clearErrorFunc,     // IN
+            void *errorData)                          // IN
 #endif
 {
    ASSERT(in);
@@ -1811,6 +1854,7 @@ RpcIn_start(RpcIn *in,                    // IN
    in->delay = 0;
    in->maxDelay = delay;
    in->errorFunc = errorFunc;
+   in->clearErrorFunc = clearErrorFunc;
    in->errorData = errorData;
 
    /* No initial result */
diff --git a/open-vm-tools/lib/sslDirect/sslDirect.c b/open-vm-tools/lib/sslDirect/sslDirect.c
index 583e112..774fb50 100644
--- a/open-vm-tools/lib/sslDirect/sslDirect.c
+++ b/open-vm-tools/lib/sslDirect/sslDirect.c
@@ -810,9 +810,63 @@ SSL_TryCompleteAccept(SSLSock ssl) // IN
  *
  * For the VMware Product Security Policy approved ciphers, see
  * https://wiki.eng.vmware.com/VSECR/vSDL/PSP/PSPRequirements#.C2.A0.C2.A0.5B3.3.E2.80.93M.5D_TLS_Cipher-Suites
+ *
+ * This list is tweaked to sort by GCM instead of by key size, as GCM adds
+ * much more value than a large AES key.
  */
 #define SSL_CIPHER_LIST \
-   "!aNULL:kECDH+AES:ECDH+AES:RSA+AES:@STRENGTH"
+   "!aNULL:kECDH+AESGCM:ECDH+AESGCM:RSA+AESGCM:kECDH+AES:ECDH+AES:RSA+AES"
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * SSLGetDefaultProtocolFlags --
+ *
+ *      Configured default SSL_CTX options (protocol subset).
+ *
+ * Results: