diff options
| -rw-r--r-- | accel-pppd/accel-ppp.conf.5 | 6 | ||||
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/accel-pppd/accel-ppp.conf.5 b/accel-pppd/accel-ppp.conf.5 index 8bb1886..f87c431 100644 --- a/accel-pppd/accel-ppp.conf.5 +++ b/accel-pppd/accel-ppp.conf.5 @@ -213,7 +213,7 @@ then lua function with name .B username will be called to construct username from dhcp packet fields. .TP -.BI "password=" username|empty|<string> +.BI "password=" username|csid|empty|<string> Specifies how to generate password. .br If password= @@ -224,6 +224,10 @@ If password= .B empty then password will be empty string. .br +If password= +.B csid +then password will be same as Calling-Station-Id. +.br Or you can specify fixed password in .B <string>. .TP diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index 0764b20..3739475 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -591,6 +591,7 @@ static void ipoe_session_start(struct ipoe_session *ses) int r; char *passwd; char *username; + const char *pass; if (ses->dhcpv4_request && conf_verbose) { log_ppp_info2("recv "); @@ -631,15 +632,23 @@ static void ipoe_session_start(struct ipoe_session *ses) } #endif + if (conf_password) { + if (!strcmp(conf_password, "csid")) + pass = ses->ctrl.calling_station_id; + else + pass = conf_password; + } else + pass = username; + ses->username = username; - r = pwdb_check(&ses->ses, (pwdb_callback)auth_result, ses, username, PPP_PAP, conf_password ? conf_password : username); + r = pwdb_check(&ses->ses, (pwdb_callback)auth_result, ses, username, PPP_PAP, pass); if (r == PWDB_WAIT) return; if (r == PWDB_NO_IMPL) { passwd = pwdb_get_passwd(&ses->ses, username); - if (!passwd) + if (!passwd || strcmp(passwd, pass)) r = PWDB_DENIED; else { r = PWDB_SUCCESS; |