From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:22:54 +0000 (-0700)
Subject: Replace RpcOut_sendOne with RpcChannel_SendOne in vmtoolsd commandline.
X-Git-Tag: stable-10.2.0~624
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc251c97d74439a81feb6f5cb60f592a4d4b38bb;p=thirdparty%2Fopen-vm-tools.git

Replace RpcOut_sendOne with RpcChannel_SendOne in vmtoolsd commandline.

"vmtoolsd --cmd=<payload>" uses RpcOut_sendOne which is a backdoor
only implementation. It should try vSocket before falling back to
backdoor.
---

diff --git a/open-vm-tools/services/vmtoolsd/cmdLine.c b/open-vm-tools/services/vmtoolsd/cmdLine.c
index d7027c3cc..6e619f1d0 100644
--- a/open-vm-tools/services/vmtoolsd/cmdLine.c
+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
@@ -35,13 +35,13 @@
 
 #include "vm_assert.h"
 #include "conf.h"
-#include "rpcout.h"
 #include "str.h"
 #include "vmcheck.h"
 #include "vmtoolsd_version.h"
 #include "vmware/tools/log.h"
 #include "vmware/tools/utils.h"
 #include "vmware/tools/i18n.h"
+#include "vmware/tools/guestrpc.h"
 #include "vm_version.h"
 
 /**
@@ -69,7 +69,7 @@ ToolsCoreRunCommand(const gchar *option,
       char *result = NULL;
       Bool status = FALSE;
 
-      status = RpcOut_sendOne(&result, NULL, "%s", value);
+      status = RpcChannel_SendOne(&result, NULL, "%s", value);
 
       if (!status) {
          g_printerr("%s\n", result ? result : "NULL");