github/openNDS
1
1
Fork 0
mirror of https://github.com/openNDS/openNDS.git synced 2026-01-10 20:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix - Set fas_remotefqdn to gw_fqdn when overriding FAS settings

Browse Source 
Signed-off-by: Rob White <rob@blue-wave.net>
This commit is contained in:
Rob White
2023-07-11 09:38:12 +01:00
parent 756ccaaa7c
commit aa0d32a553
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/conf.c
View File

@@ -206,7 +206,6 @@ config_init(int argc, char **argv)
config.fas_remoteip = safe_strdup(set_option_str("fasremoteip", DEFAULT_FAS_REMOTEIP, debug_level));
config.fas_remotefqdn = safe_strdup(set_option_str("fasremotefqdn", DEFAULT_FAS_REMOTEFQDN, debug_level));
/*
********** Integer config parameters **********
*/

7
src/main.c
View File

@@ -305,7 +305,6 @@ setup_from_config(void)
config = config_get_config();
safe_asprintf(&lib_cmd, "/usr/lib/opennds/libopennds.sh \"pad_string\" \"left\" \"00000000\" \"%x\"", config->fw_mark_authenticated);
msg = safe_calloc(SMALL_BUF);
@@ -603,7 +602,6 @@ setup_from_config(void)
config->preauth = NULL;
}
// If PreAuth is enabled, override any FAS configuration and check script exists
if (config->preauth) {
debug(LOG_NOTICE, "Preauth is Enabled - Overriding FAS configuration.\n");
@@ -618,7 +616,7 @@ setup_from_config(void)
//override all other FAS settings
config->fas_remoteip = safe_strdup(config->gw_ip);
config->fas_remotefqdn = NULL;
config->fas_remotefqdn = safe_strdup(config->gw_fqdn);
config->fas_port = config->gw_port;
safe_asprintf(&preauth_dir, "/%s/", config->preauthdir);
config->fas_path = safe_strdup(preauth_dir);
@@ -725,8 +723,9 @@ setup_from_config(void)
}
// Setup the FAS URL
fasurl = safe_calloc(SMALL_BUF);
if (strcmp(config->fas_remotefqdn, "") == 0) {
if (strcmp(config->fas_remotefqdn, "disable") == 0 || strcmp(config->fas_remotefqdn, "disabled") == 0) {
safe_asprintf(&fasurl, "%s://%s:%u%s",
protocol, config->fas_remoteip, config->fas_port, config->fas_path);
config->fas_url = safe_strdup(fasurl);