common version: use disable-tools-version for old hosts only

Use disable-tools-version for old hosts only, and add a
hide-tools-version flag. Set disable-tools-version to "true"
again for OSPs.

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index f3756d887531ca77b1795388961951972bc715cb..5813c956b48ada7d2043e6046e5987b15aea4867 100644 (file)
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -52,6 +52,7 @@
 #define CONFNAME_LOGFILE                  "log.file"
 #define CONFNAME_LOGLEVEL                 "log.level"
 #define CONFNAME_DISABLETOOLSVERSION      "disable-tools-version"
+#define CONFNAME_HIDETOOLSVERSION         "hide-tools-version"
 #define CONFNAME_DISABLEPMTIMERWARNING    "disable-pmtimerwarning"
 
 

diff --git a/open-vm-tools/services/vmtoolsd/toolsRpc.c b/open-vm-tools/services/vmtoolsd/toolsRpc.c
index ea4e92e41b9f3cdf4e55060e9c4a79034b5ecdcd..a10ef3d831714831bec8b2d97875894b322893a4 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/toolsRpc.c
+++ b/open-vm-tools/services/vmtoolsd/toolsRpc.c
@@ -153,10 +153,10 @@ ToolsCoreRpcCapReg(RpcInData *data)
       char *result = NULL;
       size_t resultLen;
       gchar *toolsVersion;
-      gboolean disableVersion = g_key_file_get_boolean(state->ctx.config,
-                                                       "vmtools",
-                                                       CONFNAME_DISABLETOOLSVERSION,
-                                                       NULL);
+      gboolean hideVersion = g_key_file_get_boolean(state->ctx.config,
+                                                    "vmtools",
+                                                    CONFNAME_HIDETOOLSVERSION,
+                                                    NULL);
 
 #if defined(_WIN32)
       type = TOOLS_TYPE_MSI;
@@ -175,7 +175,7 @@ ToolsCoreRpcCapReg(RpcInData *data)
 #endif
 #endif
 
-      version = disableVersion ? TOOLS_VERSION_UNMANAGED : TOOLS_VERSION_CURRENT;
+      version = hideVersion ? TOOLS_VERSION_UNMANAGED : TOOLS_VERSION_CURRENT;
 
       /*
        * First try "tools.set.versiontype", if that fails because host is too
@@ -185,6 +185,8 @@ ToolsCoreRpcCapReg(RpcInData *data)
 
       if (!RpcChannel_Send(state->ctx.rpc, toolsVersion, strlen(toolsVersion) + 1,
                            &result, &resultLen)) {
+         GError *gerror = NULL;
+         gboolean disableVersion;
          vm_free(result);
          g_free(toolsVersion);
 
@@ -192,9 +194,19 @@ ToolsCoreRpcCapReg(RpcInData *data)
           * Fall back to old behavior for OSPs and OVT so that tools will be
           * reported as guest managed.
           */
-         if (type == TOOLS_TYPE_OSP || type == TOOLS_TYPE_OVT) {
-            version = TOOLS_VERSION_UNMANAGED;
+         disableVersion = g_key_file_get_boolean(state->ctx.config,
+                                                          "vmtools",
+                                                          CONFNAME_DISABLETOOLSVERSION,
+                                                          &gerror);
+
+         /* By default disableVersion is FALSE, except for open-vm-tools */
+         if (type == TOOLS_TYPE_OVT && gerror != NULL) {
+            g_debug("gerror->code = %d when checking for %s\n", gerror->code, CONFNAME_DISABLETOOLSVERSION);
+            g_clear_error(&gerror);
+            disableVersion = TRUE;
          }
+
+         version = disableVersion ? TOOLS_VERSION_UNMANAGED : TOOLS_VERSION_CURRENT;
          toolsVersion = g_strdup_printf("tools.set.version %u", version);
 
          if (!RpcChannel_Send(state->ctx.rpc, toolsVersion, strlen(toolsVersion) + 1,