From c5e425242a6b52cb4a70db09ba0afe9bd7b91087 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 23 Nov 2022 11:00:57 +0100 Subject: [PATCH] [settings] Typo in GatewayHttpExtAuthSspiNtlm --- client/common/cmdline.c | 2 +- include/freerdp/settings.h | 4 ++-- libfreerdp/common/settings_getters.c | 8 ++++---- libfreerdp/core/gateway/rdg.c | 2 +- libfreerdp/core/settings.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 484a863d1..7e7720988 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -2978,7 +2978,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, } else if (option_equals(c, "extauth-sspi-ntlm")) { - if (!freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpExtAuthSspiNtln, + if (!freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpExtAuthSspiNtlm, TRUE)) return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; } diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index 26e40f179..9f0a4cfa8 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -772,7 +772,7 @@ typedef struct #define FreeRDP_GatewayAcceptedCert (1998) #define FreeRDP_GatewayAcceptedCertLength (1999) #define FreeRDP_GatewayHttpUseWebsockets (2000) -#define FreeRDP_GatewayHttpExtAuthSspiNtln (2001) +#define FreeRDP_GatewayHttpExtAuthSspiNtlm (2001) #define FreeRDP_ProxyType (2015) #define FreeRDP_ProxyHostname (2016) #define FreeRDP_ProxyPort (2017) @@ -1338,7 +1338,7 @@ struct rdp_settings ALIGN64 char* GatewayAcceptedCert; /* 1998 */ ALIGN64 UINT32 GatewayAcceptedCertLength; /* 1999 */ ALIGN64 BOOL GatewayHttpUseWebsockets; /* 2000 */ - ALIGN64 BOOL GatewayHttpExtAuthSspiNtln; /* 2001 */ + ALIGN64 BOOL GatewayHttpExtAuthSspiNtlm; /* 2001 */ UINT64 padding2015[2015 - 2002]; /* 2002 */ /* Proxy */ diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c index 731e83f1f..b5e445d4b 100644 --- a/libfreerdp/common/settings_getters.c +++ b/libfreerdp/common/settings_getters.c @@ -222,8 +222,8 @@ BOOL freerdp_settings_get_bool(const rdpSettings* settings, size_t id) case FreeRDP_GatewayHttpUseWebsockets: return settings->GatewayHttpUseWebsockets; - case FreeRDP_GatewayHttpExtAuthSspiNtln: - return settings->GatewayHttpExtAuthSspiNtln; + case FreeRDP_GatewayHttpExtAuthSspiNtlm: + return settings->GatewayHttpExtAuthSspiNtlm; case FreeRDP_GatewayRpcTransport: return settings->GatewayRpcTransport; @@ -832,8 +832,8 @@ BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL val) case FreeRDP_GatewayHttpUseWebsockets: settings->GatewayHttpUseWebsockets = cnv.c; break; - case FreeRDP_GatewayHttpExtAuthSspiNtln: - settings->GatewayHttpExtAuthSspiNtln = cnv.c; + case FreeRDP_GatewayHttpExtAuthSspiNtlm: + settings->GatewayHttpExtAuthSspiNtlm = cnv.c; break; case FreeRDP_GatewayRpcTransport: diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 180e9305e..9feebdea1 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -2692,7 +2692,7 @@ rdpRdg* rdg_new(rdpContext* context) rdg->state = RDG_CLIENT_STATE_INITIAL; rdg->context = context; rdg->settings = rdg->context->settings; - rdg->extAuth = (rdg->settings->GatewayHttpExtAuthSspiNtln ? HTTP_EXTENDED_AUTH_SSPI_NTLM + rdg->extAuth = (rdg->settings->GatewayHttpExtAuthSspiNtlm ? HTTP_EXTENDED_AUTH_SSPI_NTLM : HTTP_EXTENDED_AUTH_NONE); if (rdg->settings->GatewayAccessToken) diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c index 48f6c96c6..87f88a59a 100644 --- a/libfreerdp/core/settings.c +++ b/libfreerdp/core/settings.c @@ -601,7 +601,7 @@ rdpSettings* freerdp_settings_new(DWORD flags) !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpTransport, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayUdpTransport, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpUseWebsockets, TRUE) || - !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpExtAuthSspiNtln, FALSE) || + !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpExtAuthSspiNtlm, FALSE) || !freerdp_settings_set_bool(settings, FreeRDP_FastPathInput, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_FastPathOutput, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_LongCredentialsSupported, TRUE) ||