[client,common] make all azure settings configurable

This commit is contained in:
akallabeth
2025-03-18 16:15:41 +01:00
parent d690ea0cb2
commit 6168a7bfd1
10 changed files with 301 additions and 83 deletions

View File

@@ -2821,6 +2821,12 @@ const char* freerdp_settings_get_string(WINPR_ATTR_UNUSED const rdpSettings* set
case FreeRDP_GatewayAvdAadtenantid:
return settings->GatewayAvdAadtenantid;
case FreeRDP_GatewayAvdAccessAadFormat:
return settings->GatewayAvdAccessAadFormat;
case FreeRDP_GatewayAvdAccessTokenFormat:
return settings->GatewayAvdAccessTokenFormat;
case FreeRDP_GatewayAvdActivityhint:
return settings->GatewayAvdActivityhint;
@@ -2839,6 +2845,9 @@ const char* freerdp_settings_get_string(WINPR_ATTR_UNUSED const rdpSettings* set
case FreeRDP_GatewayAvdHubdiscoverygeourl:
return settings->GatewayAvdHubdiscoverygeourl;
case FreeRDP_GatewayAvdScope:
return settings->GatewayAvdScope;
case FreeRDP_GatewayAvdWvdEndpointPool:
return settings->GatewayAvdWvdEndpointPool;
@@ -3136,6 +3145,12 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, FreeRDP_Settin
case FreeRDP_GatewayAvdAadtenantid:
return settings->GatewayAvdAadtenantid;
case FreeRDP_GatewayAvdAccessAadFormat:
return settings->GatewayAvdAccessAadFormat;
case FreeRDP_GatewayAvdAccessTokenFormat:
return settings->GatewayAvdAccessTokenFormat;
case FreeRDP_GatewayAvdActivityhint:
return settings->GatewayAvdActivityhint;
@@ -3154,6 +3169,9 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, FreeRDP_Settin
case FreeRDP_GatewayAvdHubdiscoverygeourl:
return settings->GatewayAvdHubdiscoverygeourl;
case FreeRDP_GatewayAvdScope:
return settings->GatewayAvdScope;
case FreeRDP_GatewayAvdWvdEndpointPool:
return settings->GatewayAvdWvdEndpointPool;
@@ -3462,6 +3480,12 @@ BOOL freerdp_settings_set_string_(WINPR_ATTR_UNUSED rdpSettings* settings,
case FreeRDP_GatewayAvdAadtenantid:
return update_string_(&settings->GatewayAvdAadtenantid, cnv.c, len);
case FreeRDP_GatewayAvdAccessAadFormat:
return update_string_(&settings->GatewayAvdAccessAadFormat, cnv.c, len);
case FreeRDP_GatewayAvdAccessTokenFormat:
return update_string_(&settings->GatewayAvdAccessTokenFormat, cnv.c, len);
case FreeRDP_GatewayAvdActivityhint:
return update_string_(&settings->GatewayAvdActivityhint, cnv.c, len);
@@ -3480,6 +3504,9 @@ BOOL freerdp_settings_set_string_(WINPR_ATTR_UNUSED rdpSettings* settings,
case FreeRDP_GatewayAvdHubdiscoverygeourl:
return update_string_(&settings->GatewayAvdHubdiscoverygeourl, cnv.c, len);
case FreeRDP_GatewayAvdScope:
return update_string_(&settings->GatewayAvdScope, cnv.c, len);
case FreeRDP_GatewayAvdWvdEndpointPool:
return update_string_(&settings->GatewayAvdWvdEndpointPool, cnv.c, len);
@@ -3804,6 +3831,13 @@ BOOL freerdp_settings_set_string_copy_(WINPR_ATTR_UNUSED rdpSettings* settings,
case FreeRDP_GatewayAvdAadtenantid:
return update_string_copy_(&settings->GatewayAvdAadtenantid, cnv.cc, len, cleanup);
case FreeRDP_GatewayAvdAccessAadFormat:
return update_string_copy_(&settings->GatewayAvdAccessAadFormat, cnv.cc, len, cleanup);
case FreeRDP_GatewayAvdAccessTokenFormat:
return update_string_copy_(&settings->GatewayAvdAccessTokenFormat, cnv.cc, len,
cleanup);
case FreeRDP_GatewayAvdActivityhint:
return update_string_copy_(&settings->GatewayAvdActivityhint, cnv.cc, len, cleanup);
@@ -3824,6 +3858,9 @@ BOOL freerdp_settings_set_string_copy_(WINPR_ATTR_UNUSED rdpSettings* settings,
return update_string_copy_(&settings->GatewayAvdHubdiscoverygeourl, cnv.cc, len,
cleanup);
case FreeRDP_GatewayAvdScope:
return update_string_copy_(&settings->GatewayAvdScope, cnv.cc, len, cleanup);
case FreeRDP_GatewayAvdWvdEndpointPool:
return update_string_copy_(&settings->GatewayAvdWvdEndpointPool, cnv.cc, len, cleanup);

View File

@@ -491,6 +491,10 @@ static const struct settings_str_entry settings_map[] = {
{ FreeRDP_GatewayAccessToken, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_GatewayAccessToken" },
{ FreeRDP_GatewayAvdAadtenantid, FREERDP_SETTINGS_TYPE_STRING,
"FreeRDP_GatewayAvdAadtenantid" },
{ FreeRDP_GatewayAvdAccessAadFormat, FREERDP_SETTINGS_TYPE_STRING,
"FreeRDP_GatewayAvdAccessAadFormat" },
{ FreeRDP_GatewayAvdAccessTokenFormat, FREERDP_SETTINGS_TYPE_STRING,
"FreeRDP_GatewayAvdAccessTokenFormat" },
{ FreeRDP_GatewayAvdActivityhint, FREERDP_SETTINGS_TYPE_STRING,
"FreeRDP_GatewayAvdActivityhint" },
{ FreeRDP_GatewayAvdArmpath, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_GatewayAvdArmpath" },
@@ -500,6 +504,7 @@ static const struct settings_str_entry settings_map[] = {
{ FreeRDP_GatewayAvdGeo, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_GatewayAvdGeo" },
{ FreeRDP_GatewayAvdHubdiscoverygeourl, FREERDP_SETTINGS_TYPE_STRING,
"FreeRDP_GatewayAvdHubdiscoverygeourl" },
{ FreeRDP_GatewayAvdScope, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_GatewayAvdScope" },
{ FreeRDP_GatewayAvdWvdEndpointPool, FREERDP_SETTINGS_TYPE_STRING,
"FreeRDP_GatewayAvdWvdEndpointPool" },
{ FreeRDP_GatewayAzureActiveDirectory, FREERDP_SETTINGS_TYPE_STRING,