mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[settings] Typo in GatewayHttpExtAuthSspiNtlm

Browse Source
This commit is contained in:
Armin Novak 2022-11-23 11:00:57 +01:00 committed by Martin Fleisz
parent 2cb8d93343
commit c5e425242a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/cmdline.c
View File

@ -2978,7 +2978,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
} }
else if (option_equals(c, "extauth-sspi-ntlm")) 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)) TRUE))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
} }

4
include/freerdp/settings.h
View File

@ -772,7 +772,7 @@ typedef struct
#define FreeRDP_GatewayAcceptedCert (1998) #define FreeRDP_GatewayAcceptedCert (1998)
#define FreeRDP_GatewayAcceptedCertLength (1999) #define FreeRDP_GatewayAcceptedCertLength (1999)
#define FreeRDP_GatewayHttpUseWebsockets (2000) #define FreeRDP_GatewayHttpUseWebsockets (2000)
#define FreeRDP_GatewayHttpExtAuthSspiNtln (2001) #define FreeRDP_GatewayHttpExtAuthSspiNtlm (2001)
#define FreeRDP_ProxyType (2015) #define FreeRDP_ProxyType (2015)
#define FreeRDP_ProxyHostname (2016) #define FreeRDP_ProxyHostname (2016)
#define FreeRDP_ProxyPort (2017) #define FreeRDP_ProxyPort (2017)
@ -1338,7 +1338,7 @@ struct rdp_settings
ALIGN64 char* GatewayAcceptedCert; /* 1998 */ ALIGN64 char* GatewayAcceptedCert; /* 1998 */
ALIGN64 UINT32 GatewayAcceptedCertLength; /* 1999 */ ALIGN64 UINT32 GatewayAcceptedCertLength; /* 1999 */
ALIGN64 BOOL GatewayHttpUseWebsockets; /* 2000 */ ALIGN64 BOOL GatewayHttpUseWebsockets; /* 2000 */
ALIGN64 BOOL GatewayHttpExtAuthSspiNtln; /* 2001 */ ALIGN64 BOOL GatewayHttpExtAuthSspiNtlm; /* 2001 */
UINT64 padding2015[2015 - 2002]; /* 2002 */ UINT64 padding2015[2015 - 2002]; /* 2002 */
/* Proxy */ /* Proxy */

8
libfreerdp/common/settings_getters.c
View File

@ -222,8 +222,8 @@ BOOL freerdp_settings_get_bool(const rdpSettings* settings, size_t id)
case FreeRDP_GatewayHttpUseWebsockets: case FreeRDP_GatewayHttpUseWebsockets:
return settings->GatewayHttpUseWebsockets; return settings->GatewayHttpUseWebsockets;
case FreeRDP_GatewayHttpExtAuthSspiNtln: case FreeRDP_GatewayHttpExtAuthSspiNtlm:
return settings->GatewayHttpExtAuthSspiNtln; return settings->GatewayHttpExtAuthSspiNtlm;
case FreeRDP_GatewayRpcTransport: case FreeRDP_GatewayRpcTransport:
return settings->GatewayRpcTransport; return settings->GatewayRpcTransport;
@ -832,8 +832,8 @@ BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL val)
case FreeRDP_GatewayHttpUseWebsockets: case FreeRDP_GatewayHttpUseWebsockets:
settings->GatewayHttpUseWebsockets = cnv.c; settings->GatewayHttpUseWebsockets = cnv.c;
break; break;
case FreeRDP_GatewayHttpExtAuthSspiNtln: case FreeRDP_GatewayHttpExtAuthSspiNtlm:
settings->GatewayHttpExtAuthSspiNtln = cnv.c; settings->GatewayHttpExtAuthSspiNtlm = cnv.c;
break; break;
case FreeRDP_GatewayRpcTransport: case FreeRDP_GatewayRpcTransport:

2
libfreerdp/core/gateway/rdg.c
View File

@ -2692,7 +2692,7 @@ rdpRdg* rdg_new(rdpContext* context)
rdg->state = RDG_CLIENT_STATE_INITIAL; rdg->state = RDG_CLIENT_STATE_INITIAL;
rdg->context = context; rdg->context = context;
rdg->settings = rdg->context->settings; 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); : HTTP_EXTENDED_AUTH_NONE);
if (rdg->settings->GatewayAccessToken) if (rdg->settings->GatewayAccessToken)

2
libfreerdp/core/settings.c
View File

@ -601,7 +601,7 @@ rdpSettings* freerdp_settings_new(DWORD flags)
!freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpTransport, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpTransport, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_GatewayUdpTransport, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_GatewayUdpTransport, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpUseWebsockets, 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_FastPathInput, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_FastPathOutput, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_FastPathOutput, TRUE) ||
!freerdp_settings_set_bool(settings, FreeRDP_LongCredentialsSupported, TRUE) || !freerdp_settings_set_bool(settings, FreeRDP_LongCredentialsSupported, TRUE) ||