Commit 2f411a2c authored by Adam Wujek's avatar Adam Wujek

Kconfig: rename RVLAN_DAEMON to RVLAN_ENABLE

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parent c8b9fe16
Pipeline #728 passed with stage
in 61 minutes and 53 seconds
......@@ -1125,14 +1125,14 @@ config LLDPD_MINIMUM_FRAME_SIZE
endmenu
menu "Radius-vlan options"
config RVLAN_DAEMON
config RVLAN_ENABLE
bool "Run the 'radius-vlan' authorization daemon"
help
If the program runs, it implements a subset of 802.1X
config RVLAN_PMASK
string "A port mask, as hex number, to be monitored by radiusvlan"
depends on RVLAN_DAEMON
depends on RVLAN_ENABLE
default "ffffffff"
help
The string must be a number, with or without leading 0x.
......@@ -1143,19 +1143,19 @@ config RVLAN_PMASK
config RVLAN_AUTH_VLAN
int "Default vlan to be used for ports during radius authorization"
depends on RVLAN_DAEMON
depends on RVLAN_ENABLE
range 1 4094
default 4094
config RVLAN_NOAUTH_VLAN
int "Vlan to be used for ports whose authorization is denied"
depends on RVLAN_DAEMON
depends on RVLAN_ENABLE
range 1 4094
default 4094
config RVLAN_OBEY_DOTCONFIG
bool "When auth is ok, ignore radius' vlan and obey dot-cofig instead"
depends on RVLAN_DAEMON
depends on RVLAN_ENABLE
default N
help
In some installations the radius server os only used to allow/deny
......@@ -1165,7 +1165,7 @@ config RVLAN_OBEY_DOTCONFIG
config RVLAN_RADIUS_SERVERS
string "IP Address(es) of the radius server(s)"
depends on RVLAN_DAEMON
depends on RVLAN_ENABLE
default "192.168.16.181,192.168.16.182"
help
This is an IPV4 address or a list of them.
......@@ -1173,7 +1173,7 @@ config RVLAN_RADIUS_SERVERS
config RVLAN_RADIUS_SECRET
string "The shared secret to encrypt radius queries"
depends on RVLAN_DAEMON
depends on RVLAN_ENABLE
default "our-secret"
help
The secret string used by radclient as called by radiusvlan
......
......@@ -87,7 +87,7 @@ This is the list of configuration items related to @i{radiusvlan}. None
of them has effects on the firmware build, they are only used at runtime.
@table @code
@item RVLAN_DAEMON
@item RVLAN_ENABLE
The boolean option selects whether the tool is to be run or not.
If disabled, the tool will not run and the related @i{monit} rule
......@@ -154,7 +154,7 @@ can be confirmed by running
which will properly trigger a @i{monit-triggered} reboot.
Both invocation and monitoring depend on @i{dot-config}: if @t{RVLAN_DAEMON}
Both invocation and monitoring depend on @i{dot-config}: if @t{RVLAN_ENABLE}
is false, neither of them is activated.
@c ##########################################################################
......
......@@ -20,7 +20,7 @@ start() {
echo "$0 unable to source dot-config ($dotconfig)!"
fi
if [ "$CONFIG_RVLAN_DAEMON" != "y" ]; then
if [ "$CONFIG_RVLAN_ENABLE" != "y" ]; then
echo "Radius-VLAN: disabled\n"
exit 0
fi
......
......@@ -178,7 +178,7 @@ if [ "$CONFIG_MONIT_DISABLE" != "y" ]; then
monitor=0
fi
;;
radiusvlan) if [ "$CONFIG_RVLAN_DAEMON" != "y" ] ; then
radiusvlan) if [ "$CONFIG_RVLAN_ENABLE" != "y" ] ; then
monitor=0
fi
;;
......
......@@ -502,13 +502,13 @@ static void update_daemon_expectancy(struct wrs_usd_item *daemon_array)
}
daemon_array[UDI_RVLAN].exp = 0;
tmp = libwr_cfg_get("RVLAN_DAEMON");
tmp = libwr_cfg_get("RVLAN_ENABLE");
if (tmp && !strcmp(tmp, "y")) {
/* SNMP should not expect radiusvlan to be running */
daemon_array[UDI_RVLAN].exp = 1;
snmp_log(LOG_INFO, "SNMP: " SL_INFO
" wrsBootUserspaceDaemonsMissing:"
" no CONFIG_RVLAN_DAEMON in dot-config\n");
" no CONFIG_RVLAN_ENABLE in dot-config\n");
}
}
......
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