diff options
| -rw-r--r-- | radsecproxy.c | 12 | ||||
| -rw-r--r-- | radsecproxy.conf-example | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/radsecproxy.c b/radsecproxy.c index 8cf2f27..f0d6529 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -3017,7 +3017,7 @@ int configure_fticks(char **reporting, char **mac, char **key) { else if (strcasecmp(*reporting, "Full") == 0) options.fticks_reporting = RSP_FTICKS_REPORTING_FULL; else { - debugx(1, DBG_ERR, "config error: invalid F-Ticks-Reporting value: %s", + debugx(1, DBG_ERR, "config error: invalid FTicksReporting value: %s", *reporting); r = 1; goto out; @@ -3036,7 +3036,7 @@ int configure_fticks(char **reporting, char **mac, char **key) { else if (strcasecmp(*mac, "FullyKeyHashed") == 0) options.fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED; else { - debugx(1, DBG_ERR, "config error: invalid F-Ticks-MAC value: %s", *mac); + debugx(1, DBG_ERR, "config error: invalid FTicksMAC value: %s", *mac); r = 1; goto out; } @@ -3045,7 +3045,7 @@ int configure_fticks(char **reporting, char **mac, char **key) { && (options.fticks_mac == RSP_FTICKS_MAC_VENDOR_KEY_HASHED || options.fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) { debugx(1, DBG_ERR, - "config error: F-Ticks-MAC %s requires an F-Ticks-Key", *mac); + "config error: FTicksMAC %s requires an FTicksKey", *mac); options.fticks_mac = RSP_FTICKS_MAC_STATIC; r = 1; goto out; @@ -3127,9 +3127,9 @@ void getmainconfig(const char *configfile) { "TLS", CONF_CBK, conftls_cb, NULL, #endif "Rewrite", CONF_CBK, confrewrite_cb, NULL, - "F-Ticks-Reporting", CONF_STR, &fticks_reporting_str, - "F-Ticks-MAC", CONF_STR, &fticks_mac_str, - "F-Ticks-Key", CONF_STR, &fticks_key_str, + "FTicksReporting", CONF_STR, &fticks_reporting_str, + "FTicksMAC", CONF_STR, &fticks_mac_str, + "FTicksKey", CONF_STR, &fticks_key_str, NULL )) debugx(1, DBG_ERR, "configuration error"); diff --git a/radsecproxy.conf-example b/radsecproxy.conf-example index 04a27ef..8f96626 100644 --- a/radsecproxy.conf-example +++ b/radsecproxy.conf-example @@ -30,7 +30,7 @@ #LogDestination x-syslog:///log_local2 # For generating log entries conforming to the F-Ticks system, specify -# F-Ticks-Reporting with one of the following values. +# FTicksReporting with one of the following values. # None -- Do not log in F-Ticks format. This is the default. # Basic -- Do log in F-Ticks format but do not log VISINST. # Full -- Do log in F-Ticks format and do log VISINST. @@ -38,7 +38,7 @@ # its matching client configuration block has to contain the # fticksVISCOUNTRY option. -# You can optionally specify F-Ticks-MAC in order to determine if and +# You can optionally specify FTicksMAC in order to determine if and # how Calling-Station-Id is logged. # Static -- Use a static string as a placeholder for # Calling-Station-Id. This is the default. @@ -48,13 +48,13 @@ # FullyHashed -- Hash the entire string. # FullyKeyHashed -- Like FullyHashed but salt with F-Ticks-Key. -# In order to use F-Ticks-MAC with one of VendorKeyHashed or -# FullyKeyHashed, specify a key with F-Ticks-Key. -# F-Ticks-Key <key> +# In order to use FTicksMAC with one of VendorKeyHashed or +# FullyKeyHashed, specify a key with FTicksKey. +# FTicksKey <key> # Default F-Ticks configuration: -#F-Ticks-Reporting None -#F-Ticks-Mac FullyKeyHashed +#FTicksReporting None +#FTicksMac FullyKeyHashed # There is an option for doing some simple loop prevention. Note that # the LoopPrevention directive can be used in server blocks too, |