]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
ToolsCore_GetVmusrLimit(): use app name from ToolsServiceState struct
authorOliver Kurth <okurth@vmware.com>
Fri, 26 Oct 2018 17:44:55 +0000 (10:44 -0700)
committerOliver Kurth <okurth@vmware.com>
Fri, 26 Oct 2018 17:44:55 +0000 (10:44 -0700)
The vmusr process on Windows is calling ToolsCore_GetVmusrLimit() early
in the process before ToolsCore_Setup() is called to initialize the
ctx member.  In ToolsCore_GetVmusrLimit(), changing the call to
VMTools_ConfigGetInteger to use "state->name" instead of the
state->ctx.name.

open-vm-tools/services/vmtoolsd/mainLoop.c

index fdbf5078a247778318a76736d35b1cca8fadc4bf..aabc25cea679f38171b25207b1aa31bcf745f4f0 100644 (file)
@@ -534,7 +534,7 @@ ToolsCore_GetVmusrLimit(ToolsServiceState *state)      // IN
 
    if (TOOLS_IS_USER_SERVICE(state)) {
       errorLimit = VMTools_ConfigGetInteger(state->ctx.config,
-                                            state->ctx.name,
+                                            state->name,
                                             CONFNAME_MAX_CHANNEL_ATTEMPTS,
                                             VMUSR_CHANNEL_ERR_DEFAULT);
 
@@ -547,7 +547,7 @@ ToolsCore_GetVmusrLimit(ToolsServiceState *state)      // IN
            errorLimit > VMUSR_CHANNEL_ERR_MAX)) {
          g_warning("%s: Invalid %s: %s (%d) specified in tools configuration; "
                    "using default value (%d)\n", __FUNCTION__,
-                   state->ctx.name, CONFNAME_MAX_CHANNEL_ATTEMPTS,
+                   state->name, CONFNAME_MAX_CHANNEL_ATTEMPTS,
                    errorLimit, VMUSR_CHANNEL_ERR_DEFAULT);
          errorLimit = VMUSR_CHANNEL_ERR_DEFAULT;
       }