From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Jun 2018 18:07:44 +0000 (-0700)
Subject: Log full version of Tools in vmware.log.
X-Git-Tag: stable-10.3.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3961588fcce58090c249f4a65ad8cc109efecc5c;p=thirdparty%2Fopen-vm-tools.git

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.
---

diff --git a/open-vm-tools/services/vmtoolsd/toolsRpc.c b/open-vm-tools/services/vmtoolsd/toolsRpc.c
index a10ef3d83..aaf6c1d6d 100644
--- a/open-vm-tools/services/vmtoolsd/toolsRpc.c
+++ b/open-vm-tools/services/vmtoolsd/toolsRpc.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-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
@@ -36,7 +36,7 @@
 #include "str.h"
 #include "strutil.h"
 #include "toolsCoreInt.h"
-#include "vm_tools_version.h"
+#include "vmtoolsd_version.h"
 #include "vmware/tools/utils.h"
 #include "vmware/tools/log.h"
 #include "vm_version.h"
@@ -81,10 +81,11 @@ ToolsCoreCheckReset(RpcChannel *chan,
 
       if (!version_sent) {
          /*
-          * Log the Tools build number to the VMX log file. We don't really care
+          * Log the Tools version to the VMX log file. We don't really care
           * if sending the message fails.
           */
-         msg = g_strdup_printf("log %s: Version: %s", app, BUILD_NUMBER);
+         msg = g_strdup_printf("log %s: Version: %s (%s)",
+                               app, VMTOOLSD_VERSION_STRING, BUILD_NUMBER);
          RpcChannel_Send(state->ctx.rpc, msg, strlen(msg) + 1, NULL, NULL);
          g_free(msg);
          /* send message only once to prevent log spewing: */