From: VMware, Inc <> Date: Thu, 2 Aug 2012 05:25:19 +0000 (-0700) Subject: Internal branch sync. Included in this change: X-Git-Tag: 2012.10.14-874563~89 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13bf70945d446ab983cb1ab6c8aedcbc912daa4e;p=thirdparty%2Fopen-vm-tools.git Internal branch sync. Included in this change: . more VGAuth rename work (handle renaming in foundry, the automation socket protocol and tools) . CopyPaste - fix up 64-bit X11 selection timestamp handling . changes in shared code that don't affect open-vm-tools functionality Signed-off-by: Dmitry Torokhov --- diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c index f6308a76a..63fff738b 100644 --- a/open-vm-tools/lib/foundryMsg/foundryMsg.c +++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c @@ -452,13 +452,13 @@ static const VixCommandInfo vixCommandInfoTable[] = { VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_HOT_CHANGE_MONITOR_TYPE, VIX_COMMAND_CATEGORY_PRIVILEGED), - VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_ADD_AUTH_PRINCIPAL, + VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_ADD_AUTH_ALIAS, VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), - VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REMOVE_AUTH_PRINCIPAL, + VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REMOVE_AUTH_ALIAS, VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), - VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_LIST_AUTH_PROVIDER_PRINCIPALS, + VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_LIST_AUTH_PROVIDER_ALIASES, VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), - VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_LIST_AUTH_MAPPED_PRINCIPALS, + VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_LIST_AUTH_MAPPED_ALIASES, VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED), VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_CREATE_REGISTRY_KEY, diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h index c17119d68..f0ac88b1e 100644 --- a/open-vm-tools/lib/include/log.h +++ b/open-vm-tools/lib/include/log.h @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 1998 VMware, Inc. All rights reserved. + * Copyright (C) 1998-2012 VMware, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -172,6 +172,7 @@ typedef struct int32 stderrMinLevel; // This level and above to stderr int32 logMinLevel; // This level and above to log + int permissions; // Permissions for log files uint32 keepOld; // Number of old logs to keep uint32 throttleThreshold; // Threshold for throttling @@ -194,6 +195,8 @@ Bool Log_InitWithFile(const char *fileName, Bool Log_InitWithConfig(const char *appPrefix); +void Log_UpdateFilePermissions(int permissions); + void Log_UpdateFileControl(Bool append, unsigned keepOld, size_t rotateSize, diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h index b386b6693..e48617f62 100644 --- a/open-vm-tools/lib/include/vixCommands.h +++ b/open-vm-tools/lib/include/vixCommands.h @@ -1699,7 +1699,7 @@ VixMsgReadEnvironmentVariablesRequest; typedef #include "vmware_pack_begin.h" -struct VixMsgAddAuthPrincipalRequest { +struct VixMsgAddAliasRequest { VixCommandRequestHeader header; uint32 options; @@ -1708,22 +1708,22 @@ struct VixMsgAddAuthPrincipalRequest { uint32 pemCertLen; Bool addMapping; - int32 principalType; // one of VixGuestAuthPrincipalType - uint32 principalNameLen; - uint32 principalCommentLen; + int32 subjectType; // one of VixGuestAuthSubjectType + uint32 subjectNameLen; + uint32 aliasCommentLen; /* Followed by the NUL-terminated string arguments. */ /* char[] userName; */ /* char[] pemCert; */ - /* char[] principalName; */ - /* char[] principalComment; */ + /* char[] subjectName; */ + /* char[] aliasComment; */ } #include "vmware_pack_end.h" -VixMsgAddAuthPrincipalRequest; +VixMsgAddAuthAliasRequest; typedef #include "vmware_pack_begin.h" -struct VixMsgRemoveAuthPrincipalRequest { +struct VixMsgRemoveAuthAliasRequest { VixCommandRequestHeader header; uint32 options; @@ -1731,22 +1731,22 @@ struct VixMsgRemoveAuthPrincipalRequest { uint32 userNameLen; uint32 pemCertLen; - // special case for RemoveProvider: - // if principalType is NONE, then all principals will be removed. - int32 principalType; // one of VixGuestAuthPrincipalType - uint32 principalNameLen; + // special case for RemoveAliasByCert: + // if subjectType is NONE, then all aliases will be removed. + int32 subjectType; // one of VixGuestAuthSubjectType + uint32 subjectNameLen; /* Followed by the NUL-terminated string arguments. */ /* char[] userName; */ /* char[] pemCert; */ - /* char[] principalName; */ + /* char[] subjectName; */ } #include "vmware_pack_end.h" -VixMsgRemoveAuthPrincipalRequest; +VixMsgRemoveAuthAliasRequest; typedef #include "vmware_pack_begin.h" -struct VixMsgListAuthPrincipalsRequest { +struct VixMsgListAuthAliasesRequest { VixCommandRequestHeader header; uint32 options; @@ -1756,17 +1756,17 @@ struct VixMsgListAuthPrincipalsRequest { /* char[] userName; */ } #include "vmware_pack_end.h" -VixMsgListAuthPrincipalsRequest; +VixMsgListAuthAliasesRequest; typedef #include "vmware_pack_begin.h" -struct VixMsgListMappedPrincipalsRequest { +struct VixMsgListMappedAliasesRequest { VixCommandRequestHeader header; uint32 options; } #include "vmware_pack_end.h" -VixMsgListMappedPrincipalsRequest; +VixMsgListMappedAliasesRequest; /* * Windows Registry Management Support. @@ -2429,10 +2429,10 @@ enum { VIX_COMMAND_DELETE_GUEST_DIRECTORY_EX = 195, VIX_COMMAND_HOT_CHANGE_MONITOR_TYPE = 196, - VIX_COMMAND_ADD_AUTH_PRINCIPAL = 197, - VIX_COMMAND_REMOVE_AUTH_PRINCIPAL = 198, - VIX_COMMAND_LIST_AUTH_PROVIDER_PRINCIPALS = 199, - VIX_COMMAND_LIST_AUTH_MAPPED_PRINCIPALS = 200, + VIX_COMMAND_ADD_AUTH_ALIAS = 197, + VIX_COMMAND_REMOVE_AUTH_ALIAS = 198, + VIX_COMMAND_LIST_AUTH_PROVIDER_ALIASES = 199, + VIX_COMMAND_LIST_AUTH_MAPPED_ALIASES = 200, VIX_COMMAND_CREATE_REGISTRY_KEY = 201, VIX_COMMAND_LIST_REGISTRY_KEYS = 202, diff --git a/open-vm-tools/lib/include/vixOpenSource.h b/open-vm-tools/lib/include/vixOpenSource.h index 7c9ba7815..fff2ab33e 100644 --- a/open-vm-tools/lib/include/vixOpenSource.h +++ b/open-vm-tools/lib/include/vixOpenSource.h @@ -275,10 +275,10 @@ enum { VIX_PROPERTY_GUEST_CHANGE_FILE_ATTRIBUTES_ENABLED = 4555, VIX_PROPERTY_GUEST_INITIATE_FILE_TRANSFER_FROM_GUEST_ENABLED = 4556, VIX_PROPERTY_GUEST_INITIATE_FILE_TRANSFER_TO_GUEST_ENABLED = 4557, - VIX_PROPERTY_GUEST_ADD_AUTH_PRINICPAL_ENABLED = 4558, - VIX_PROPERTY_GUEST_REMOVE_AUTH_PRINICPAL_ENABLED = 4559, - VIX_PROPERTY_GUEST_LIST_AUTH_PRINICPALS_ENABLED = 4560, - VIX_PROPERTY_GUEST_LIST_MAPPED_PRINICPALS_ENABLED = 4561, + VIX_PROPERTY_GUEST_ADD_AUTH_ALIAS_ENABLED = 4558, + VIX_PROPERTY_GUEST_REMOVE_AUTH_ALIAS_ENABLED = 4559, + VIX_PROPERTY_GUEST_LIST_AUTH_ALIASES_ENABLED = 4560, + VIX_PROPERTY_GUEST_LIST_MAPPED_ALIASES_ENABLED = 4561, VIX_PROPERTY_GUEST_CREATE_REGISTRY_KEY_ENABLED = 4562, VIX_PROPERTY_GUEST_LIST_REGISTRY_KEYS_ENABLED = 4563, VIX_PROPERTY_GUEST_DELETE_REGISTRY_KEY_ENABLED = 4564, @@ -581,13 +581,13 @@ enum { }; /* - * Principal types for IdProvider management. + * Subject types for Alias management. */ -typedef enum VixGuestAuthPrincipalType { - VIX_GUEST_AUTH_PRINCIPAL_TYPE_NONE = 0, - VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED = 1, - VIX_GUEST_AUTH_PRINCIPAL_TYPE_ANY = 2, -} VixGuestAuthPrincipalType; +typedef enum VixGuestAuthSubjectType { + VIX_GUEST_AUTH_SUBJECT_TYPE_NONE = 0, + VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED = 1, + VIX_GUEST_AUTH_SUBJECT_TYPE_ANY = 2, +} VixGuestAuthSubjectType; /* * Types for Windows Registry Management. diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h index ae2187409..80af3d118 100644 --- a/open-vm-tools/lib/include/vm_version.h +++ b/open-vm-tools/lib/include/vm_version.h @@ -83,7 +83,7 @@ * hard-coded value for every other product. */ #if defined(VMX86_DESKTOP) - #define PRODUCT_VERSION 8,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* WORKSTATION_VERSION_NUMBER below has to match this */ + #define PRODUCT_VERSION 9,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* WORKSTATION_VERSION_NUMBER below has to match this */ #elif defined(VMX86_TOOLS) #define PRODUCT_VERSION TOOLS_VERSION_EXT_CURRENT_CSV #elif defined(VMX86_VCB) @@ -92,13 +92,13 @@ #define PRODUCT_VERSION 1,1,5,PRODUCT_BUILD_NUMBER_NUMERIC #elif defined(VMX86_VPX) /* this should be kept in sync with the corresponding vpx branch. */ - #define PRODUCT_VERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC + #define PRODUCT_VERSION 6,0,0,PRODUCT_BUILD_NUMBER_NUMERIC #elif defined(VMX86_BOOMERANG) #define PRODUCT_VERSION 1,0,0,PRODUCT_BUILD_NUMBER_NUMERIC #elif defined(VMX86_VIEW) #define PRODUCT_VERSION 0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC #else - #define PRODUCT_VERSION 4,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */ + #define PRODUCT_VERSION 5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */ #endif /* @@ -125,7 +125,7 @@ * VMI 2.0 : 3.1.0 * P2VA 3.0 : 3.?.? */ -#define VIE_FILEVERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC +#define VIE_FILEVERSION 6,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* * This string can be a little more "free form". The license @@ -185,7 +185,7 @@ #define ESX_RELEASE_PATCH "0" /* 0 = experimental */ #define ESX_RELEASE ESX_RELEASE_UPDATE "." ESX_RELEASE_PATCH #define VMSERVER_VERSION "e.x.p" -#define WORKSTATION_VERSION_NUMBER "8.0.0" /* this version number should always match real WS version number */ +#define WORKSTATION_VERSION_NUMBER "9.0.0" /* this version number should always match real WS version number */ #define WORKSTATION_VERSION "e.x.p" #define WORKSTATION_RELEASE_DESCRIPTION "" #define WORKSTATION_ENTERPRISE_VERSION "e.x.p" @@ -196,7 +196,7 @@ #define CONSOLE_VERSION "4.1.0" #define P2V_VERSION "e.x.p" #define P2V_FILE_VERSION 3,0,0,0 -#define PLAYER_VERSION_NUMBER "4.0.0" /* this version number should always match real Player version number */ +#define PLAYER_VERSION_NUMBER "5.0.0" /* this version number should always match real Player version number */ #define PLAYER_VERSION "e.x.p" /* @@ -209,17 +209,17 @@ #define HBR_SERVER_VERSION "e.x.p" // These must match VIE_FILEVERSION above -#define SYSIMAGE_VERSION "5.1.0" +#define SYSIMAGE_VERSION "6.0.0" #define SYSIMAGE_FILE_VERSION VIE_FILEVERSION #define VCB_VERSION "4.0.0" #define VCB_FILE_VERSION 4,0,0,0 -#define VIM_VERSION "5.1.0" +#define VIM_VERSION "6.0.0" // Put VPX_VERSION first, because vpx/make/defs.mk doesn't check for suffix. -#define VPX_VERSION "5.1.0" -#define VPX_VERSION_MAJOR "5" -#define VPX_VERSION_MINOR "1" +#define VPX_VERSION "6.0.0" +#define VPX_VERSION_MAJOR "6" +#define VPX_VERSION_MINOR "0" #define VPX_VERSION_MAINT "0" #define VPX_VERSION_THIRD_PARTY VPX_VERSION_MAJOR VPX_VERSION_MINOR \ VPX_VERSION_MAINT diff --git a/open-vm-tools/lib/include/vmfs.h b/open-vm-tools/lib/include/vmfs.h index c2a1f91dc..d59b93ce3 100644 --- a/open-vm-tools/lib/include/vmfs.h +++ b/open-vm-tools/lib/include/vmfs.h @@ -44,6 +44,7 @@ #define FILE_DIR_NAME "file" #define RAMDISK_DIR_NAME "ramdisk" #define SVM_DIR_NAME "svm" +#define VFLASH_DIR_NAME "vflash" #define DEVFS_MOUNT_POINT VMFS_ROOT_DIR_PATH DEVFS_DIR_NAME #define VCFS_MOUNT_POINT VMFS_ROOT_DIR_PATH VCFS_DIR_NAME @@ -51,20 +52,23 @@ #define DEVFS_MOUNT_PATH DEVFS_MOUNT_POINT "/" #define VCFS_MOUNT_PATH VCFS_MOUNT_POINT "/" -#define DELTADISK_MOUNT_POINT DEVFS_MOUNT_PATH DELTADISK_DIR_NAME +#define DELTADISK_MOUNT_POINT DEVFS_MOUNT_PATH DELTADISK_DIR_NAME #define DELTADISK_MOUNT_PATH DELTADISK_MOUNT_POINT "/" -#define CBT_MOUNT_POINT DEVFS_MOUNT_PATH CBT_DIR_NAME -#define CBT_MOUNT_PATH CBT_MOUNT_POINT "/" +#define CBT_MOUNT_POINT DEVFS_MOUNT_PATH CBT_DIR_NAME +#define CBT_MOUNT_PATH CBT_MOUNT_POINT "/" -#define FILE_MOUNT_POINT DEVFS_MOUNT_PATH FILE_DIR_NAME -#define FILE_MOUNT_PATH FILE_MOUNT_POINT "/" +#define FILE_MOUNT_POINT DEVFS_MOUNT_PATH FILE_DIR_NAME +#define FILE_MOUNT_PATH FILE_MOUNT_POINT "/" -#define RAMDISK_MOUNT_POINT DEVFS_MOUNT_PATH RAMDISK_DIR_NAME -#define RAMDISK_MOUNT_PATH RAMDISK_MOUNT_POINT "/" +#define RAMDISK_MOUNT_POINT DEVFS_MOUNT_PATH RAMDISK_DIR_NAME +#define RAMDISK_MOUNT_PATH RAMDISK_MOUNT_POINT "/" -#define SVM_MOUNT_POINT DEVFS_MOUNT_PATH SVM_DIR_NAME -#define SVM_MOUNT_PATH SVM_MOUNT_POINT "/" +#define SVM_MOUNT_POINT DEVFS_MOUNT_PATH SVM_DIR_NAME +#define SVM_MOUNT_PATH SVM_MOUNT_POINT "/" + +#define VFLASH_MOUNT_POINT DEVFS_MOUNT_PATH VFLASH_DIR_NAME +#define VFLASH_MOUNT_PATH VFLASH_MOUNT_POINT "/" #define CDROM_DRIVER_STRING "cdrom" #define SCSI_DISK_DRIVER_STRING "disks" @@ -88,7 +92,7 @@ #define VISOR_GENERIC_SCSI_MOUNT_POINT VISOR_DEVFS_MOUNT_PATH SCSI_GENERIC_DRIVER_STRING #define VISOR_CDROM_MOUNT_PATH VISOR_CDROM_MOUNT_POINT "/" #define VISOR_DISKS_MOUNT_PATH VISOR_DISKS_MOUNT_POINT "/" -#define VISOR_GENERIC_SCSI_MOUNT_PATH VISOR_GENERIC_SCSI_MOUNT_POINT "/" +#define VISOR_GENERIC_SCSI_MOUNT_PATH VISOR_GENERIC_SCSI_MOUNT_POINT "/" typedef enum { VMFS_SYMBOLIC, diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp index 043a4ccd7..ebd280af2 100644 --- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp +++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp @@ -26,6 +26,43 @@ * http://www.jwz.org/doc/x-cut-and-paste.html */ + +/* + * A Word on Selection Timestamps + * + * ICCCM §2.6.2 Target Atoms + * The TIMESTAMP property is an INTEGER. + * + * ICCCM §2.7 Use of Selection Properties + * The format of INTEGER is 32. + * + * XGetWindowProperty(3) + * “If the returned format is 32, the property will be stored as an + * array of longs (which in a 64-bit application will be 64-bit values + * that are padded in the upper 4 bytes).” + * + * For all intents and purposes, on x86 and x86_64 X selection timestamps + * are a 32-bit quantity. (X11/Xproto.h's xSetSelectionOwnerReq defines the + * “time” member as the lower 32 bits of type Time.) X clients, on the + * other hand, operate on Time as either a CARD32 (uint32) or an unsigned + * long (i.e., on a 64-bit machine Time may occupy 8 bytes). + * + * Breaking it down: + * · When Gtk+ provides a X11 selection via Gtk::SelectionData, on a + * 32-bit machine we'll have 4 bytes of raw data. Everything's copacetic. + * · On a 64-bit machine, even if the source client provides on 32 bits + * of timestamp data, Gtk+ will decode as an unsigned long and provide 8 + * bytes of raw data. + * · On a 64-bit machine with a wacky application which actually tries + * to record a full 64 bits of timestamp data, Gtk+ will provide 16 bytes: + * <32 bits of 0s> <32 bits of 0s>. (See + * PR 882322, mrxvt.) + * + * In all instances, we're interested in _only_ the lowest 32 bits, so we'll + * ignore everything else. + */ + + #define G_LOG_DOMAIN "dndcp" #include @@ -579,16 +616,19 @@ void CopyPasteUIX11::LocalClipboardTimestampCB(const Gtk::SelectionData& sd) // IN { int length = sd.get_length(); - g_debug("%s: enter sd.get_length() %d.\n", __FUNCTION__, - length); - if (length == 4) { - mClipTime = ((uint32*) sd.get_data())[0]; - g_debug("%s: mClipTime: %"FMT64"u.", __FUNCTION__, mClipTime); - } else if (length == 8) { - mClipTime = ((uint64*) sd.get_data())[0]; - g_debug("%s: mClipTime: %"FMT64"u.", __FUNCTION__, mClipTime); + + /* + * See “A Word on Selection Timestamps” above. + */ + if ( sd.get_data_type().compare("INTEGER") == 0 + && sd.get_format() == 32 + && length >= 4 /* sizeof uint32 */) { + mClipTime = reinterpret_cast(sd.get_data())[0]; } else { - g_debug("%s: Unable to get mClipTime.", __FUNCTION__); + g_debug("%s: Unable to get mClipTime (sd: len %d, type %s, fmt %d).", + __FUNCTION__, length, + length >= 0 ? sd.get_data_type().c_str() : "(n/a)", + sd.get_format()); } Glib::RefPtr refClipboard @@ -619,15 +659,19 @@ void CopyPasteUIX11::LocalPrimTimestampCB(const Gtk::SelectionData& sd) // IN { int length = sd.get_length(); - g_debug("%s: enter sd.get_length() is %d.\n", __FUNCTION__, length); - if (length == 4) { - mPrimTime = ((uint32*) sd.get_data())[0]; - g_debug("%s: mPrimTime: %"FMT64"u.", __FUNCTION__, mPrimTime); - } else if (length == 8) { - mPrimTime = ((uint64*) sd.get_data())[0]; - g_debug("%s: mPrimTime: %"FMT64"u.", __FUNCTION__, mPrimTime); + + /* + * See “A Word on Selection Timestamps” above. + */ + if ( sd.get_data_type().compare("INTEGER") == 0 + && sd.get_format() == 32 + && length >= 4 /* sizeof uint32 */) { + mPrimTime = reinterpret_cast(sd.get_data())[0]; } else { - g_debug("%s: Unable to get mPrimTime.", __FUNCTION__); + g_debug("%s: Unable to get mPrimTime (sd: len %d, type %s, fmt %d).", + __FUNCTION__, length, + length >= 0 ? sd.get_data_type().c_str() : "(n/a)", + sd.get_format()); } if (mGetTimestampOnly) { diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c index 5537a6b21..d093956d3 100644 --- a/open-vm-tools/services/plugins/vix/vixTools.c +++ b/open-vm-tools/services/plugins/vix/vixTools.c @@ -137,7 +137,7 @@ #include "VGAuthCommon.h" #include "VGAuthError.h" #include "VGAuthAuthentication.h" -#include "VGAuthIdProvider.h" +#include "VGAuthAlias.h" #define VMTOOLSD_APP_NAME "vmtoolsd" @@ -198,10 +198,10 @@ static gboolean QueryVGAuthConfig(GKeyFile *confDictRef); #define VIX_TOOLS_CONFIG_API_ACQUIRE_CREDENTIALS_NAME "AcquireCredentialsInGuest" #define VIX_TOOLS_CONFIG_API_RELEASE_CREDENTIALS_NAME "ReleaseCredentialsInGuest" -#define VIX_TOOLS_CONFIG_API_ADD_AUTH_PRINCIPAL_NAME "AddAuthPrincipal" -#define VIX_TOOLS_CONFIG_API_REMOVE_AUTH_PRINCIPAL_NAME "RemoveAuthPrincipal" -#define VIX_TOOLS_CONFIG_API_LIST_AUTH_PRINCIPALS_NAME "ListAuthPrincipals" -#define VIX_TOOLS_CONFIG_API_LIST_MAPPED_PRINCIPALS_NAME "ListMappedPrincipals" +#define VIX_TOOLS_CONFIG_API_ADD_AUTH_ALIAS_NAME "AddAuthAlias" +#define VIX_TOOLS_CONFIG_API_REMOVE_AUTH_ALIAS_NAME "RemoveAuthAlias" +#define VIX_TOOLS_CONFIG_API_LIST_AUTH_ALIASES_NAME "ListAuthAliases" +#define VIX_TOOLS_CONFIG_API_LIST_MAPPED_ALIASES_NAME "ListMappedAliases" #define VIX_TOOLS_CONFIG_API_CREATE_REGISTRY_KEY_NAME "CreateRegistryKey" #define VIX_TOOLS_CONFIG_API_LIST_REGISTRY_KEYS_NAME "ListRegistryKeys" @@ -2660,10 +2660,10 @@ VixToolsGetAPIDisabledFromConf(GKeyFile *confDictRef, // IN * Make sure vgauth related stuff does not show as enabled. */ if (NULL != varName) { - if ((strcmp(varName, VIX_TOOLS_CONFIG_API_ADD_AUTH_PRINCIPAL_NAME) == 0) || - (strcmp(varName, VIX_TOOLS_CONFIG_API_REMOVE_AUTH_PRINCIPAL_NAME) == 0) || - (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_AUTH_PRINCIPALS_NAME) == 0) || - (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_MAPPED_PRINCIPALS_NAME) == 0)) { + if ((strcmp(varName, VIX_TOOLS_CONFIG_API_ADD_AUTH_ALIAS_NAME) == 0) || + (strcmp(varName, VIX_TOOLS_CONFIG_API_REMOVE_AUTH_ALIAS_NAME) == 0) || + (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_AUTH_ALIASES_NAME) == 0) || + (strcmp(varName, VIX_TOOLS_CONFIG_API_LIST_MAPPED_ALIASES_NAME) == 0)) { disabled = TRUE; } } @@ -2873,30 +2873,30 @@ VixToolsSetAPIEnabledProperties(VixPropertyListImpl *propList, // IN } err = VixPropertyList_SetBool(propList, - VIX_PROPERTY_GUEST_ADD_AUTH_PRINICPAL_ENABLED, + VIX_PROPERTY_GUEST_ADD_AUTH_ALIAS_ENABLED, VixToolsComputeEnabledProperty(confDictRef, - VIX_TOOLS_CONFIG_API_ADD_AUTH_PRINCIPAL_NAME)); + VIX_TOOLS_CONFIG_API_ADD_AUTH_ALIAS_NAME)); if (VIX_OK != err) { goto exit; } err = VixPropertyList_SetBool(propList, - VIX_PROPERTY_GUEST_REMOVE_AUTH_PRINICPAL_ENABLED, + VIX_PROPERTY_GUEST_REMOVE_AUTH_ALIAS_ENABLED, VixToolsComputeEnabledProperty(confDictRef, - VIX_TOOLS_CONFIG_API_REMOVE_AUTH_PRINCIPAL_NAME)); + VIX_TOOLS_CONFIG_API_REMOVE_AUTH_ALIAS_NAME)); if (VIX_OK != err) { goto exit; } err = VixPropertyList_SetBool(propList, - VIX_PROPERTY_GUEST_LIST_AUTH_PRINICPALS_ENABLED, + VIX_PROPERTY_GUEST_LIST_AUTH_ALIASES_ENABLED, VixToolsComputeEnabledProperty(confDictRef, - VIX_TOOLS_CONFIG_API_LIST_AUTH_PRINCIPALS_NAME)); + VIX_TOOLS_CONFIG_API_LIST_AUTH_ALIASES_NAME)); if (VIX_OK != err) { goto exit; } err = VixPropertyList_SetBool(propList, - VIX_PROPERTY_GUEST_LIST_MAPPED_PRINICPALS_ENABLED, + VIX_PROPERTY_GUEST_LIST_MAPPED_ALIASES_ENABLED, VixToolsComputeEnabledProperty(confDictRef, - VIX_TOOLS_CONFIG_API_LIST_MAPPED_PRINCIPALS_NAME)); + VIX_TOOLS_CONFIG_API_LIST_MAPPED_ALIASES_NAME)); if (VIX_OK != err) { goto exit; } @@ -8704,32 +8704,32 @@ abort: /* *----------------------------------------------------------------------------- * - * VixToolsAddAuthPrincipal -- + * VixToolsAddAuthAlias -- * - * Calls to VGAuth to add a new principal. + * Calls to VGAuth to add a new alias. * * Return value: * VixError * * Side effects: - * VGAuth IdProvider store is updated. + * VGAuth alias store is updated. * *----------------------------------------------------------------------------- */ VixError -VixToolsAddAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN +VixToolsAddAuthAlias(VixCommandRequestHeader *requestMsg) // IN { VixError err = VIX_OK; VGAuthError vgErr; void *userToken = NULL; VGAuthContext *ctx = NULL; - VixMsgAddAuthPrincipalRequest *req; + VixMsgAddAuthAliasRequest *req; const char *userName; const char *pemCert; - const char *principalName; - const char *principalComment; - VGAuthSubjectInfo si; + const char *subjectName; + const char *aliasComment; + VGAuthAliasInfo ai; VMAutomationRequestParser parser; Bool impersonatingVMWareUser = FALSE; @@ -8740,7 +8740,7 @@ VixToolsAddAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN goto abort; } - req = (VixMsgAddAuthPrincipalRequest *) requestMsg; + req = (VixMsgAddAuthAliasRequest *) requestMsg; err = VMAutomationRequestParserGetOptionalString(&parser, req->userNameLen, &userName); if (VIX_OK != err) { @@ -8763,26 +8763,26 @@ VixToolsAddAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN goto abort; } - if ((req->principalType != VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED) && - (req->principalType != VIX_GUEST_AUTH_PRINCIPAL_TYPE_ANY)) { + if ((req->subjectType != VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED) && + (req->subjectType != VIX_GUEST_AUTH_SUBJECT_TYPE_ANY)) { err = VIX_E_INVALID_ARG; goto abort; } - err = VMAutomationRequestParserGetOptionalString(&parser, req->principalNameLen, - &principalName); + err = VMAutomationRequestParserGetOptionalString(&parser, req->subjectNameLen, + &subjectName); if (VIX_OK != err) { goto abort; } - if ((req->principalType == VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED) && - (NULL == principalName || 0 == *principalName)) { + if ((req->subjectType == VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED) && + (NULL == subjectName || 0 == *subjectName)) { err = VIX_E_INVALID_ARG; goto abort; } - err = VMAutomationRequestParserGetOptionalString(&parser, req->principalCommentLen, - &principalComment); + err = VMAutomationRequestParserGetOptionalString(&parser, req->aliasCommentLen, + &aliasComment); if (VIX_OK != err) { goto abort; } @@ -8800,13 +8800,13 @@ VixToolsAddAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN goto abort; } - si.subject.type = (req->principalType == VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED) ? + ai.subject.type = (req->subjectType == VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED) ? VGAUTH_SUBJECT_NAMED : VGAUTH_SUBJECT_ANY; - si.subject.val.name = (char *) principalName; - si.comment = (char *) principalComment; + ai.subject.val.name = (char *) subjectName; + ai.comment = (char *) aliasComment; - vgErr = VGAuth_AddSubject(ctx, userName, req->addMapping, pemCert, &si, - 0, NULL); + vgErr = VGAuth_AddAlias(ctx, userName, req->addMapping, pemCert, &ai, + 0, NULL); if (VGAUTH_FAILED(vgErr)) { err = VixToolsTranslateVGAuthError(vgErr); } @@ -8826,30 +8826,30 @@ abort: /* *----------------------------------------------------------------------------- * - * VixToolsRemoveAuthPrincipal -- + * VixToolsRemoveAuthAlias -- * - * Calls to VGAuth to remove a principal. + * Calls to VGAuth to remove an alias. * * Return value: * VixError * * Side effects: - * VGAuth IdProvider store is updated. + * VGAuth Alias store is updated. * *----------------------------------------------------------------------------- */ VixError -VixToolsRemoveAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN +VixToolsRemoveAuthAlias(VixCommandRequestHeader *requestMsg) // IN { VixError err = VIX_OK; VGAuthError vgErr; void *userToken = NULL; VGAuthContext *ctx = NULL; - VixMsgRemoveAuthPrincipalRequest *req; + VixMsgRemoveAuthAliasRequest *req; const char *userName; const char *pemCert; - const char *principalName; + const char *subjectName; VGAuthSubject subj; VMAutomationRequestParser parser; Bool impersonatingVMWareUser = FALSE; @@ -8861,7 +8861,7 @@ VixToolsRemoveAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN goto abort; } - req = (VixMsgRemoveAuthPrincipalRequest *) requestMsg; + req = (VixMsgRemoveAuthAliasRequest *) requestMsg; err = VMAutomationRequestParserGetOptionalString(&parser, req->userNameLen, &userName); if (VIX_OK != err) { @@ -8884,21 +8884,21 @@ VixToolsRemoveAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN goto abort; } - if ((req->principalType != VIX_GUEST_AUTH_PRINCIPAL_TYPE_NONE) && - (req->principalType != VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED) && - (req->principalType != VIX_GUEST_AUTH_PRINCIPAL_TYPE_ANY)) { + if ((req->subjectType != VIX_GUEST_AUTH_SUBJECT_TYPE_NONE) && + (req->subjectType != VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED) && + (req->subjectType != VIX_GUEST_AUTH_SUBJECT_TYPE_ANY)) { err = VIX_E_INVALID_ARG; goto abort; } - err = VMAutomationRequestParserGetOptionalString(&parser, req->principalNameLen, - &principalName); + err = VMAutomationRequestParserGetOptionalString(&parser, req->subjectNameLen, + &subjectName); if (VIX_OK != err) { goto abort; } - if ((req->principalType == VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED) && - (NULL == principalName || 0 == *principalName)) { + if ((req->subjectType == VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED) && + (NULL == subjectName || 0 == *subjectName)) { err = VIX_E_INVALID_ARG; goto abort; } @@ -8916,14 +8916,14 @@ VixToolsRemoveAuthPrincipal(VixCommandRequestHeader *requestMsg) // IN goto abort; } - if (VIX_GUEST_AUTH_PRINCIPAL_TYPE_NONE == req->principalType) { - vgErr = VGAuth_RemoveCert(ctx, userName, pemCert, 0, NULL); + if (VIX_GUEST_AUTH_SUBJECT_TYPE_NONE == req->subjectType) { + vgErr = VGAuth_RemoveAliasByCert(ctx, userName, pemCert, 0, NULL); } else { - subj.type = (req->principalType == VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED) ? + subj.type = (req->subjectType == VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED) ? VGAUTH_SUBJECT_NAMED : VGAUTH_SUBJECT_ANY; - subj.val.name = (char *) principalName; + subj.val.name = (char *) subjectName; - vgErr = VGAuth_RemoveSubject(ctx, userName, pemCert, &subj, 0, NULL); + vgErr = VGAuth_RemoveAlias(ctx, userName, pemCert, &subj, 0, NULL); } if (VGAUTH_FAILED(vgErr)) { err = VixToolsTranslateVGAuthError(vgErr); @@ -8944,36 +8944,36 @@ abort: /* *----------------------------------------------------------------------------- * - * VixToolsListAuthPrincipals -- + * VixToolsListAuthAliases -- * - * Calls to VGAuth to list principals. + * Calls to VGAuth to list user aliases. * * Return value: * VixError * * Side effects: - * VGAuth IdProvider store is updated. + * VGAuth Alias store is updated. * *----------------------------------------------------------------------------- */ VixError -VixToolsListAuthPrincipals(VixCommandRequestHeader *requestMsg, // IN - size_t maxBufferSize, // IN - char **result) // OUT +VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN + size_t maxBufferSize, // IN + char **result) // OUT { VixError err = VIX_OK; VGAuthError vgErr; void *userToken = NULL; VGAuthContext *ctx = NULL; - VixMsgListAuthPrincipalsRequest *req; + VixMsgListAuthAliasesRequest *req; const char *userName; VMAutomationRequestParser parser; Bool impersonatingVMWareUser = FALSE; int num = 0; int i; int j; - VGAuthIdProvider *idList = NULL; + VGAuthUserAlias *uaList = NULL; static char resultBuffer[GUESTMSG_MAX_IN_SIZE]; char *destPtr; char *endDestPtr; @@ -8998,7 +8998,7 @@ VixToolsListAuthPrincipals(VixCommandRequestHeader *requestMsg, // IN goto abort; } - req = (VixMsgListAuthPrincipalsRequest *) requestMsg; + req = (VixMsgListAuthAliasesRequest *) requestMsg; err = VMAutomationRequestParserGetOptionalString(&parser, req->userNameLen, &userName); if (VIX_OK != err) { @@ -9023,7 +9023,7 @@ VixToolsListAuthPrincipals(VixCommandRequestHeader *requestMsg, // IN goto abort; } - vgErr = VGAuth_QueryIdProviders(ctx, userName, 0, NULL, &num, &idList); + vgErr = VGAuth_QueryUserAliases(ctx, userName, 0, NULL, &num, &uaList); if (VGAUTH_FAILED(vgErr)) { err = VixToolsTranslateVGAuthError(vgErr); goto abort; @@ -9033,7 +9033,7 @@ VixToolsListAuthPrincipals(VixCommandRequestHeader *requestMsg, // IN destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s", VIX_XML_ESCAPED_TAG); for (i = 0; i < num; i++) { - escapedStr = VixToolsEscapeXMLString(idList[i].pemCert); + escapedStr = VixToolsEscapeXMLString(uaList[i].pemCert); if (escapedStr == NULL) { err = VIX_E_OUT_OF_MEMORY; goto abort; @@ -9046,16 +9046,16 @@ VixToolsListAuthPrincipals(VixCommandRequestHeader *requestMsg, // IN err = VIX_E_OUT_OF_MEMORY; goto abort; } - for (j = 0; j < idList->numInfos; j++) { - if (idList[i].infos[j].comment) { - escapedStr = VixToolsEscapeXMLString(idList[i].infos[j].comment); + for (j = 0; j < uaList->numInfos; j++) { + if (uaList[i].infos[j].comment) { + escapedStr = VixToolsEscapeXMLString(uaList[i].infos[j].comment); if (escapedStr == NULL) { err = VIX_E_OUT_OF_MEMORY; goto abort; } } - if (idList[i].infos[j].subject.type == VGAUTH_SUBJECT_NAMED) { - escapedStr2 = VixToolsEscapeXMLString(idList[i].infos[j].subject.val.name); + if (uaList[i].infos[j].subject.type == VGAUTH_SUBJECT_NAMED) { + escapedStr2 = VixToolsEscapeXMLString(uaList[i].infos[j].subject.val.name); if (escapedStr2 == NULL) { err = VIX_E_OUT_OF_MEMORY; goto abort; @@ -9063,15 +9063,15 @@ VixToolsListAuthPrincipals(VixCommandRequestHeader *requestMsg, // IN } tmpBuf = Str_Asprintf(NULL, "%s" - "" + "" "%d" "%s" "%s" - "", + "", tmpBuf2, - (idList[i].infos[j].subject.type == VGAUTH_SUBJECT_NAMED) - ? VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED : - VIX_GUEST_AUTH_PRINCIPAL_TYPE_ANY, + (uaList[i].infos[j].subject.type == VGAUTH_SUBJECT_NAMED) + ? VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED : + VIX_GUEST_AUTH_SUBJECT_TYPE_ANY, escapedStr2 ? escapedStr2 : "", escapedStr ? escapedStr : ""); if (tmpBuf == NULL) { @@ -9112,7 +9112,7 @@ abort: free(tmpBuf2); free(escapedStr); free(escapedStr2); - VGAuth_FreeIdProviderList(num, idList); + VGAuth_FreeUserAliasList(num, uaList); if (impersonatingVMWareUser) { VixToolsUnimpersonateUser(userToken); } @@ -9128,35 +9128,35 @@ abort: /* *----------------------------------------------------------------------------- * - * VixToolsListMappedPrincipals -- + * VixToolsListMappedAliases -- * - * Calls to VGAuth to list mapped principals. + * Calls to VGAuth to list mapped aliases. * * Return value: * VixError * * Side effects: - * VGAuth IdProvider store is updated. + * VGAuth Alias store is updated. * *----------------------------------------------------------------------------- */ VixError -VixToolsListMappedPrincipals(VixCommandRequestHeader *requestMsg, // IN - size_t maxBufferSize, // IN - char **result) // OUT +VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN + size_t maxBufferSize, // IN + char **result) // OUT { VixError err = VIX_OK; VGAuthError vgErr; void *userToken = NULL; VGAuthContext *ctx = NULL; - VixMsgListMappedPrincipalsRequest *req; + VixMsgListMappedAliasesRequest *req; VMAutomationRequestParser parser; Bool impersonatingVMWareUser = FALSE; int num = 0; int i; int j; - VGAuthMappedIdentity *miList = NULL; + VGAuthMappedAlias *maList = NULL; static char resultBuffer[GUESTMSG_MAX_IN_SIZE]; char *destPtr; char *endDestPtr; @@ -9180,7 +9180,7 @@ VixToolsListMappedPrincipals(VixCommandRequestHeader *requestMsg, // IN goto abort; } - req = (VixMsgListMappedPrincipalsRequest *) requestMsg; + req = (VixMsgListMappedAliasesRequest *) requestMsg; err = VixToolsImpersonateUser((VixCommandRequestHeader *) requestMsg, &userToken); if (VIX_OK != err) { @@ -9194,7 +9194,7 @@ VixToolsListMappedPrincipals(VixCommandRequestHeader *requestMsg, // IN goto abort; } - vgErr = VGAuth_QueryMappedIdentities(ctx, 0, NULL, &num, &miList); + vgErr = VGAuth_QueryMappedAliases(ctx, 0, NULL, &num, &maList); if (VGAUTH_FAILED(vgErr)) { err = VixToolsTranslateVGAuthError(vgErr); goto abort; @@ -9204,12 +9204,12 @@ VixToolsListMappedPrincipals(VixCommandRequestHeader *requestMsg, // IN destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s", VIX_XML_ESCAPED_TAG); for (i = 0; i < num; i++) { - escapedStr = VixToolsEscapeXMLString(miList[i].pemCert); + escapedStr = VixToolsEscapeXMLString(maList[i].pemCert); if (escapedStr == NULL) { err = VIX_E_OUT_OF_MEMORY; goto abort; } - escapedStr2 = VixToolsEscapeXMLString(miList[i].userName); + escapedStr2 = VixToolsEscapeXMLString(maList[i].userName); if (escapedStr2 == NULL) { err = VIX_E_OUT_OF_MEMORY; goto abort; @@ -9222,9 +9222,9 @@ VixToolsListMappedPrincipals(VixCommandRequestHeader *requestMsg, // IN err = VIX_E_OUT_OF_MEMORY; goto abort; } - for (j = 0; j < miList->numSubjects; j++) { - if (miList[i].subjects[j].type == VGAUTH_SUBJECT_NAMED) { - escapedStr = VixToolsEscapeXMLString(miList[i].subjects[j].val.name); + for (j = 0; j < maList->numSubjects; j++) { + if (maList[i].subjects[j].type == VGAUTH_SUBJECT_NAMED) { + escapedStr = VixToolsEscapeXMLString(maList[i].subjects[j].val.name); if (escapedStr == NULL) { err = VIX_E_OUT_OF_MEMORY; goto abort; @@ -9232,14 +9232,14 @@ VixToolsListMappedPrincipals(VixCommandRequestHeader *requestMsg, // IN } tmpBuf = Str_Asprintf(NULL, "%s" - "" + "" "%d" "%s" - "", + "", tmpBuf2, - (miList[i].subjects[j].type == VGAUTH_SUBJECT_NAMED) - ? VIX_GUEST_AUTH_PRINCIPAL_TYPE_NAMED : - VIX_GUEST_AUTH_PRINCIPAL_TYPE_ANY, + (maList[i].subjects[j].type == VGAUTH_SUBJECT_NAMED) + ? VIX_GUEST_AUTH_SUBJECT_TYPE_NAMED : + VIX_GUEST_AUTH_SUBJECT_TYPE_ANY, escapedStr ? escapedStr : ""); if (tmpBuf == NULL) { err = VIX_E_OUT_OF_MEMORY; @@ -9277,7 +9277,7 @@ abort: free(tmpBuf2); free(escapedStr); free(escapedStr2); - VGAuth_FreeMappedIdentityList(num, miList); + VGAuth_FreeMappedAliasList(num, maList); if (impersonatingVMWareUser) { VixToolsUnimpersonateUser(userToken); } @@ -9826,24 +9826,24 @@ VixToolsCheckIfVixCommandEnabled(int opcode, // IN VIX_TOOLS_CONFIG_API_RELEASE_CREDENTIALS_NAME); break; - case VIX_COMMAND_ADD_AUTH_PRINCIPAL: + case VIX_COMMAND_ADD_AUTH_ALIAS: enabled = !VixToolsGetAPIDisabledFromConf(confDictRef, - VIX_TOOLS_CONFIG_API_ADD_AUTH_PRINCIPAL_NAME); + VIX_TOOLS_CONFIG_API_ADD_AUTH_ALIAS_NAME); break; - case VIX_COMMAND_REMOVE_AUTH_PRINCIPAL: + case VIX_COMMAND_REMOVE_AUTH_ALIAS: enabled = !VixToolsGetAPIDisabledFromConf(confDictRef, - VIX_TOOLS_CONFIG_API_REMOVE_AUTH_PRINCIPAL_NAME); + VIX_TOOLS_CONFIG_API_REMOVE_AUTH_ALIAS_NAME); break; - case VIX_COMMAND_LIST_AUTH_PROVIDER_PRINCIPALS: + case VIX_COMMAND_LIST_AUTH_PROVIDER_ALIASES: enabled = !VixToolsGetAPIDisabledFromConf(confDictRef, - VIX_TOOLS_CONFIG_API_LIST_AUTH_PRINCIPALS_NAME); + VIX_TOOLS_CONFIG_API_LIST_AUTH_ALIASES_NAME); break; - case VIX_COMMAND_LIST_AUTH_MAPPED_PRINCIPALS: + case VIX_COMMAND_LIST_AUTH_MAPPED_ALIASES: enabled = !VixToolsGetAPIDisabledFromConf(confDictRef, - VIX_TOOLS_CONFIG_API_LIST_MAPPED_PRINCIPALS_NAME); + VIX_TOOLS_CONFIG_API_LIST_MAPPED_ALIASES_NAME); break; case VIX_COMMAND_CREATE_REGISTRY_KEY: @@ -10223,20 +10223,20 @@ VixTools_ProcessVixCommand(VixCommandRequestHeader *requestMsg, // IN break; #if SUPPORT_VGAUTH - case VIX_COMMAND_ADD_AUTH_PRINCIPAL: - err = VixToolsAddAuthPrincipal(requestMsg); + case VIX_COMMAND_ADD_AUTH_ALIAS: + err = VixToolsAddAuthAlias(requestMsg); break; - case VIX_COMMAND_REMOVE_AUTH_PRINCIPAL: - err = VixToolsRemoveAuthPrincipal(requestMsg); + case VIX_COMMAND_REMOVE_AUTH_ALIAS: + err = VixToolsRemoveAuthAlias(requestMsg); break; - case VIX_COMMAND_LIST_AUTH_PROVIDER_PRINCIPALS: - err = VixToolsListAuthPrincipals(requestMsg, maxResultBufferSize, - &resultValue); + case VIX_COMMAND_LIST_AUTH_PROVIDER_ALIASES: + err = VixToolsListAuthAliases(requestMsg, maxResultBufferSize, + &resultValue); // resultValue is static. Do not free it. break; - case VIX_COMMAND_LIST_AUTH_MAPPED_PRINCIPALS: - err = VixToolsListMappedPrincipals(requestMsg, maxResultBufferSize, - &resultValue); + case VIX_COMMAND_LIST_AUTH_MAPPED_ALIASES: + err = VixToolsListMappedAliases(requestMsg, maxResultBufferSize, + &resultValue); // resultValue is static. Do not free it. break; #endif