diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2017-12-28 20:44:00 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2017-12-28 20:44:00 +0300 |
| commit | 427c0e0303984c4f582429178a34b4d07d9b4444 (patch) | |
| tree | bd2573c3ee0c6939fbedb1283e69a447b892bba5 /accel-pppd | |
| parent | 53d53606ba52032b4ae81c4c967316816053efcc (diff) | |
| download | accel-ppp-427c0e0303984c4f582429178a34b4d07d9b4444.tar.gz accel-ppp-427c0e0303984c4f582429178a34b4d07d9b4444.zip | |
ipoe: check noauth option in [auth] section too
Diffstat (limited to 'accel-pppd')
| -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 ed2419fd..640970b1 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 79272886..27138748 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() |