From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Sep 2020 19:11:04 +0000 (-0700)
Subject: Common source file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=055fed60e4f1a545e923c2aa0c14f5ecdb53b6ab;p=thirdparty%2Fopen-vm-tools.git

Common source file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index f864742cb..3a67a085e 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -46,11 +46,13 @@
 #include "vmware/tools/vmbackup.h"
 #if defined(_WIN32)
 #  include "codeset.h"
+#  include "guestStoreClient.h"
 #  include "windowsu.h"
 #else
 #  include "posix.h"
 #endif
 
+
 /*
  * Establish the default and maximum vmusr RPC channel error limits
  * that will be used to detect that the single allowed toolbox-dnd channel
@@ -100,6 +102,13 @@ ToolsCoreCleanup(ToolsServiceState *state)
       ToolsCore_ReleaseVsockFamily(state);
    }
 #endif
+
+#if defined(_WIN32)
+   if (state->mainService && GuestStoreClient_DeInit()) {
+      g_info("%s: De-initialized GuestStore client.\n", __FUNCTION__);
+   }
+#endif
+
    if (state->ctx.rpc != NULL) {
       RpcChannel_Stop(state->ctx.rpc);
       RpcChannel_Destroy(state->ctx.rpc);
@@ -398,6 +407,12 @@ ToolsCoreRunLoop(ToolsServiceState *state)
       ToolsCoreReportVersionData(state);
    }
 
+#if defined(_WIN32)
+   if (state->mainService && GuestStoreClient_Init()) {
+      g_info("%s: Initialized GuestStore client.\n", __FUNCTION__);
+   }
+#endif
+
    if (!ToolsCore_LoadPlugins(state)) {
       return 1;
    }