Fix boolean options parsing in configuration file

Explicitely interpret zero values when parsing boolean options. This
allows to unset boolean parameters such as "verbose" when reloading
the configuration.

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>

7 files changed, 23 insertions, 23 deletions

diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index 3a7c15f5..599fc4c4 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -1201,12 +1201,12 @@ static void load_config(void)
 	const char *opt;
 
 	opt = conf_get_opt("l2tp", "verbose");
-	if (opt && atoi(opt) > 0)
-		conf_verbose = 1;
+	if (opt && atoi(opt) >= 0)
+		conf_verbose = atoi(opt) > 0;
 
 	opt = conf_get_opt("l2tp", "avp_permissive");
-	if (opt && atoi(opt) > 0)
-		conf_avp_permissive = 1;
+	if (opt && atoi(opt) >= 0)
+		conf_avp_permissive = atoi(opt) > 0;
 
 	opt = conf_get_opt("l2tp", "hello-interval");
 	if (opt && atoi(opt) > 0)
diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c
index a3476c5e..ce7b13df 100644
--- a/accel-pppd/ctrl/pptp/pptp.c
+++ b/accel-pppd/ctrl/pptp/pptp.c
@@ -743,9 +743,9 @@ static void load_config(void)
 		conf_echo_failure = atoi(opt);
 
 	opt = conf_get_opt("pptp", "verbose");
-	if (opt && atoi(opt) > 0)
-		conf_verbose = 1;
-	
+	if (opt && atoi(opt) >= 0)
+		conf_verbose = atoi(opt) > 0;
+
 	conf_mppe = MPPE_UNSET;
 	opt = conf_get_opt("pptp", "mppe");
 	if (opt) {
diff --git a/accel-pppd/ppp/ipcp_opt_ipaddr.c b/accel-pppd/ppp/ipcp_opt_ipaddr.c
index e965f5c2..98def072 100644
--- a/accel-pppd/ppp/ipcp_opt_ipaddr.c
+++ b/accel-pppd/ppp/ipcp_opt_ipaddr.c
@@ -177,8 +177,8 @@ static void load_config(void)
 	const char *opt;
 
 	opt = conf_get_opt("ppp", "check-ip");
-	if (opt && atoi(opt) > 0)
-		conf_check_exists = 1;
+	if (opt && atoi(opt) >= 0)
+		conf_check_exists = atoi(opt) > 0;
 }
 
 static void ipaddr_opt_init()
diff --git a/accel-pppd/ppp/ipv6cp_opt_intfid.c b/accel-pppd/ppp/ipv6cp_opt_intfid.c
index 9a2ddee0..8ef6c9d5 100644
--- a/accel-pppd/ppp/ipv6cp_opt_intfid.c
+++ b/accel-pppd/ppp/ipv6cp_opt_intfid.c
@@ -284,9 +284,9 @@ static void load_config(void)
 	const char *opt;
 
 	opt = conf_get_opt("ppp", "check-ip");
-	if (opt && atoi(opt) > 0)
-		conf_check_exists = 1;
-	
+	if (opt && atoi(opt) >= 0)
+		conf_check_exists = atoi(opt) > 0;
+
 	opt = conf_get_opt("ppp", "ipv6-intf-id");
 	if (opt) {
 		if (!strcmp(opt, "random"))
diff --git a/accel-pppd/ppp/ppp.c b/accel-pppd/ppp/ppp.c
index 3e1386b7..7f8963ef 100644
--- a/accel-pppd/ppp/ppp.c
+++ b/accel-pppd/ppp/ppp.c
@@ -779,8 +779,8 @@ static void load_config(void)
 	char *opt;
 
 	opt = conf_get_opt("ppp", "verbose");
-	if (opt && atoi(opt) > 0)
-		conf_ppp_verbose = 1;
+	if (opt && atoi(opt) >= 0)
+		conf_ppp_verbose = atoi(opt) > 0;
 
 	opt = conf_get_opt("ppp", "sid-case");
 	if (opt) {
diff --git a/accel-pppd/radius/radius.c b/accel-pppd/radius/radius.c
index 2709fa94..d7f30f28 100644
--- a/accel-pppd/radius/radius.c
+++ b/accel-pppd/radius/radius.c
@@ -501,13 +501,13 @@ static int load_config(void)
 		conf_acct_timeout = atoi(opt);
 
 	opt = conf_get_opt("radius", "verbose");
-	if (opt && atoi(opt) > 0)
-		conf_verbose = 1;
-	
+	if (opt && atoi(opt) >= 0)
+		conf_verbose = atoi(opt) > 0;
+
 	opt = conf_get_opt("radius", "interim-verbose");
-	if (opt && atoi(opt) > 0)
-		conf_interim_verbose = 1;
-	
+	if (opt && atoi(opt) >= 0)
+		conf_interim_verbose = atoi(opt) > 0;
+
 	opt = conf_get_opt("radius", "nas-ip-address");
 	if (opt)
 		conf_nas_ip_address = inet_addr(opt);
diff --git a/accel-pppd/shaper/shaper.c b/accel-pppd/shaper/shaper.c
index 8ae2630a..3628bc5a 100644
--- a/accel-pppd/shaper/shaper.c
+++ b/accel-pppd/shaper/shaper.c
@@ -908,9 +908,9 @@ static void load_config(void)
 
 
 	opt = conf_get_opt("shaper", "verbose");
-	if (opt && atoi(opt) > 0)
-		conf_verbose = 1;
-	
+	if (opt && atoi(opt) >= 0)
+		conf_verbose = atoi(opt) > 0;
+
 	triton_context_call(&shaper_ctx, (triton_event_func)load_time_ranges, NULL);
 }