diff options
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 8 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_auth.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index ed2419f..640970b 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -675,12 +675,12 @@ static void ipoe_session_start(struct ipoe_session *ses) ap_session_starting(&ses->ses); + if (ses->serv->opt_shared && ipoe_create_interface(ses)) + return; + if (conf_noauth) r = PWDB_SUCCESS; else { - if (ses->serv->opt_shared && ipoe_create_interface(ses)) - return; - #ifdef RADIUS if (radius_loaded) { ses->radius.send_access_request = ipoe_rad_send_auth_request; @@ -3718,6 +3718,8 @@ static void load_config(void) conf_ipv6 = 0; opt = conf_get_opt("ipoe", "noauth"); + if (!opt) + opt = conf_get_opt("auth", "noauth"); if (opt) conf_noauth = atoi(opt); else diff --git a/accel-pppd/ppp/ppp_auth.c b/accel-pppd/ppp/ppp_auth.c index 7927288..2713874 100644 --- a/accel-pppd/ppp/ppp_auth.c +++ b/accel-pppd/ppp/ppp_auth.c @@ -399,6 +399,8 @@ static void load_config(void) opt = conf_get_opt("auth", "noauth"); if (opt) conf_noauth = atoi(opt); + else + conf_noauth = 0; } static void ppp_auth_init() |