Commit d53d9023 authored by Linus Nordberg's avatar Linus Nordberg

Remove dashes from all options F-Ticks.* for consistency.

parent f06d902b
...@@ -3017,7 +3017,7 @@ int configure_fticks(char **reporting, char **mac, char **key) { ...@@ -3017,7 +3017,7 @@ int configure_fticks(char **reporting, char **mac, char **key) {
else if (strcasecmp(*reporting, "Full") == 0) else if (strcasecmp(*reporting, "Full") == 0)
options.fticks_reporting = RSP_FTICKS_REPORTING_FULL; options.fticks_reporting = RSP_FTICKS_REPORTING_FULL;
else { else {
debugx(1, DBG_ERR, "config error: invalid F-Ticks-Reporting value: %s", debugx(1, DBG_ERR, "config error: invalid FTicksReporting value: %s",
*reporting); *reporting);
r = 1; r = 1;
goto out; goto out;
...@@ -3036,7 +3036,7 @@ int configure_fticks(char **reporting, char **mac, char **key) { ...@@ -3036,7 +3036,7 @@ int configure_fticks(char **reporting, char **mac, char **key) {
else if (strcasecmp(*mac, "FullyKeyHashed") == 0) else if (strcasecmp(*mac, "FullyKeyHashed") == 0)
options.fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED; options.fticks_mac = RSP_FTICKS_MAC_FULLY_KEY_HASHED;
else { 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; r = 1;
goto out; goto out;
} }
...@@ -3045,7 +3045,7 @@ int configure_fticks(char **reporting, char **mac, char **key) { ...@@ -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_VENDOR_KEY_HASHED
|| options.fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) { || options.fticks_mac == RSP_FTICKS_MAC_FULLY_KEY_HASHED)) {
debugx(1, DBG_ERR, 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; options.fticks_mac = RSP_FTICKS_MAC_STATIC;
r = 1; r = 1;
goto out; goto out;
...@@ -3127,9 +3127,9 @@ void getmainconfig(const char *configfile) { ...@@ -3127,9 +3127,9 @@ void getmainconfig(const char *configfile) {
"TLS", CONF_CBK, conftls_cb, NULL, "TLS", CONF_CBK, conftls_cb, NULL,
#endif #endif
"Rewrite", CONF_CBK, confrewrite_cb, NULL, "Rewrite", CONF_CBK, confrewrite_cb, NULL,
"F-Ticks-Reporting", CONF_STR, &fticks_reporting_str, "FTicksReporting", CONF_STR, &fticks_reporting_str,
"F-Ticks-MAC", CONF_STR, &fticks_mac_str, "FTicksMAC", CONF_STR, &fticks_mac_str,
"F-Ticks-Key", CONF_STR, &fticks_key_str, "FTicksKey", CONF_STR, &fticks_key_str,
NULL NULL
)) ))
debugx(1, DBG_ERR, "configuration error"); debugx(1, DBG_ERR, "configuration error");
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#LogDestination x-syslog:///log_local2 #LogDestination x-syslog:///log_local2
# For generating log entries conforming to the F-Ticks system, specify # 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. # None -- Do not log in F-Ticks format. This is the default.
# Basic -- Do log in F-Ticks format but do not log VISINST. # Basic -- Do log in F-Ticks format but do not log VISINST.
# Full -- Do log in F-Ticks format and do log VISINST. # Full -- Do log in F-Ticks format and do log VISINST.
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
# its matching client configuration block has to contain the # its matching client configuration block has to contain the
# fticksVISCOUNTRY option. # 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. # how Calling-Station-Id is logged.
# Static -- Use a static string as a placeholder for # Static -- Use a static string as a placeholder for
# Calling-Station-Id. This is the default. # Calling-Station-Id. This is the default.
...@@ -48,13 +48,13 @@ ...@@ -48,13 +48,13 @@
# FullyHashed -- Hash the entire string. # FullyHashed -- Hash the entire string.
# FullyKeyHashed -- Like FullyHashed but salt with F-Ticks-Key. # FullyKeyHashed -- Like FullyHashed but salt with F-Ticks-Key.
# In order to use F-Ticks-MAC with one of VendorKeyHashed or # In order to use FTicksMAC with one of VendorKeyHashed or
# FullyKeyHashed, specify a key with F-Ticks-Key. # FullyKeyHashed, specify a key with FTicksKey.
# F-Ticks-Key <key> # FTicksKey <key>
# Default F-Ticks configuration: # Default F-Ticks configuration:
#F-Ticks-Reporting None #FTicksReporting None
#F-Ticks-Mac FullyKeyHashed #FTicksMac FullyKeyHashed
# There is an option for doing some simple loop prevention. Note that # There is an option for doing some simple loop prevention. Note that
# the LoopPrevention directive can be used in server blocks too, # the LoopPrevention directive can be used in server blocks too,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment