Remove VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT command.

We have a backdoor command i.e. VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT but
is not used anywhere in the code. VMX forwards "check user account" commands
through backdoor using VIX_BACKDOORCOMMAND_COMMAND.

I have removed the code that is related to
VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index e661e44cc64306685f8a2a41305e45e2fdb5aedc..572bef938d146440db172207c5e71b934a9f9f80 100644 (file)
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -2289,7 +2289,6 @@ enum {
 #define VIX_BACKDOORCOMMAND_SYNCDRIVER_FREEZE      VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Freeze"
 #define VIX_BACKDOORCOMMAND_SYNCDRIVER_THAW        VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Thaw"
 #define VIX_BACKDOORCOMMAND_GET_PROPERTIES         VIX_BACKDOOR_COMMAND_VERSION"Get_ToolsProperties"
-#define VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT     VIX_BACKDOOR_COMMAND_VERSION"Check_User_Account"
 #define VIX_BACKDOORCOMMAND_SEND_HGFS_PACKET       VIX_BACKDOOR_COMMAND_VERSION"Send_Hgfs_Packet"
 #define VIX_BACKDOORCOMMAND_UNRECOGNIZED_COMMAND   VIX_BACKDOOR_COMMAND_VERSION"Unrecognized_Command"
 #define VIX_BACKDOORCOMMAND_COMMAND                VIX_BACKDOOR_COMMAND_VERSION"Relayed_Command"

diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
index efdbbfa84793a6ae4005f641246c0e268cd27e45..b6febea1a9777d7f27e0dd0ba9ffde3cb23d859f 100644 (file)
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
@@ -345,85 +345,6 @@ abort:
 } // FoundryToolsDaemonGetToolsProperties
 
 
-/*
- *-----------------------------------------------------------------------------
- *
- * ToolsDaemonTcloCheckUserAccount --
- *
- *
- * Return value:
- *    TRUE on success
- *    FALSE on failure
- *
- * Side effects:
- *    None
- *
- *-----------------------------------------------------------------------------
- */
-
-gboolean
-ToolsDaemonTcloCheckUserAccount(RpcInData *data) // IN
-{
-   VixError err = VIX_OK;
-   char *credentialTypeStr = NULL;
-   char *obfuscatedNamePassword = NULL;
-   static char resultBuffer[DEFAULT_RESULT_MSG_MAX_LENGTH];
-   Bool impersonatingVMWareUser = FALSE;
-   void *userToken = NULL;
-   Debug(">ToolsDaemonTcloCheckUserAccount\n");
-
-   /*
-    * Parse the argument
-    */
-   credentialTypeStr = ToolsDaemonTcloGetQuotedString(data->args, &data->args);
-   obfuscatedNamePassword = ToolsDaemonTcloGetQuotedString(data->args, &data->args);
-
-   /*
-    * Make sure we are passed the correct arguments.
-    */
-   if ((NULL == credentialTypeStr) || (NULL == obfuscatedNamePassword)) {
-      err = VIX_E_INVALID_ARG;
-      goto abort;
-   }
-
-   if (thisProcessRunsAsRoot) {
-      impersonatingVMWareUser = VixToolsImpersonateUserImpl(credentialTypeStr, 
-                                                            VIX_USER_CREDENTIAL_NONE,
-                                                            obfuscatedNamePassword, 
-                                                            &userToken);
-      if (!impersonatingVMWareUser) {
-         err = VIX_E_GUEST_USER_PERMISSIONS;
-         goto abort;
-      }
-   }
-
-abort:
-   if (impersonatingVMWareUser) {
-      VixToolsUnimpersonateUser(userToken);
-   }
-   VixToolsLogoutUser(userToken);
-
-   /*
-    * All VMXI tools commands return results that start with a VMXI error
-    * and a guest-OS-specific error.
-    */
-   Str_Sprintf(resultBuffer,
-               sizeof(resultBuffer),
-               "%"FMT64"d %d",
-               err,
-               Err_Errno());
-   RPCIN_SETRETVALS(data, resultBuffer, TRUE);
-
-   /*
-    * These were allocated by ToolsDaemonTcloGetQuotedString.
-    */
-   free(credentialTypeStr);
-   free(obfuscatedNamePassword);
-
-   return TRUE;
-} // ToolsDaemonTcloCheckUserAccount
-
-
 /**
  * Initializes internal state of the Foundry daemon.
  *

diff --git a/open-vm-tools/services/plugins/vix/vixPlugin.c b/open-vm-tools/services/plugins/vix/vixPlugin.c
index f8438b7ab49692d5360fe26865d6cd6c782e54f0..20ed570a2a393023c07b8d98d5e7b45b5511024b 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixPlugin.c
+++ b/open-vm-tools/services/plugins/vix/vixPlugin.c
@@ -77,8 +77,6 @@ ToolsOnLoad(ToolsAppCtx *ctx)
          FoundryToolsDaemonRunProgram, NULL, NULL, NULL, 0 },
       { VIX_BACKDOORCOMMAND_GET_PROPERTIES,
          FoundryToolsDaemonGetToolsProperties, NULL, NULL, 0 },
-      { VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT,
-         ToolsDaemonTcloCheckUserAccount, NULL, NULL, NULL, 0 },
       { VIX_BACKDOORCOMMAND_SEND_HGFS_PACKET,
          ToolsDaemonHgfsImpersonated, NULL, NULL, NULL, 0 },
       { VIX_BACKDOORCOMMAND_COMMAND,

diff --git a/open-vm-tools/services/plugins/vix/vixPluginInt.h b/open-vm-tools/services/plugins/vix/vixPluginInt.h
index 107f0f8bd77362c7022db108a9dca1bb84ac21e7..01b9752ab30dd9f6096d4c5a7e4a2c34b38626bb 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixPluginInt.h
+++ b/open-vm-tools/services/plugins/vix/vixPluginInt.h
@@ -36,9 +36,6 @@ FoundryToolsDaemon_Initialize(ToolsAppCtx *ctx);
 void
 FoundryToolsDaemon_Uninitialize(ToolsAppCtx *ctx);
 
-gboolean
-ToolsDaemonTcloCheckUserAccount(RpcInData *data);
-
 gboolean
 FoundryToolsDaemonGetToolsProperties(RpcInData *data);