diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-08-03 22:20:00 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-08-03 22:20:00 +0400 |
| commit | 3a0e34a252c7b5d93ee3e5804a89362c5fefc7ee (patch) | |
| tree | e1ea82026bf50ed7615f987a4b41779aa6fe8d40 | |
| parent | dee9aa718363d00d3cca815b137aa49ed91bc851 (diff) | |
| parent | 6f9d8f7b04763df492b239ffe6f18ff91ed17c16 (diff) | |
| download | accel-ppp-3a0e34a252c7b5d93ee3e5804a89362c5fefc7ee.tar.gz accel-ppp-3a0e34a252c7b5d93ee3e5804a89362c5fefc7ee.zip | |
Merge branch '1.7' of ssh://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp into 1.7
| -rw-r--r-- | accel-pppd/ppp/ccp_mppe.c | 3 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_ccp.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/accel-pppd/ppp/ccp_mppe.c b/accel-pppd/ppp/ccp_mppe.c index 388e2f6c..570bbdfb 100644 --- a/accel-pppd/ppp/ccp_mppe.c +++ b/accel-pppd/ppp/ccp_mppe.c @@ -79,6 +79,9 @@ static struct ccp_option_t *mppe_init(struct ppp_ccp_t *ccp) if (mppe == MPPE_REQUIRE || mppe == MPPE_PREFER) ccp->ld.passive = 0; + if (mppe == MPPE_REQUIRE) + ccp->ld.optional = 0; + mppe_opt->opt.id = CI_MPPE; mppe_opt->opt.len = 6; diff --git a/accel-pppd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c index 87ce857a..1d8acca6 100644 --- a/accel-pppd/ppp/ppp_ccp.c +++ b/accel-pppd/ppp/ppp_ccp.c @@ -731,7 +731,7 @@ static void ccp_recv_proto_rej(struct ppp_handler_t *h) { struct ppp_ccp_t *ccp = container_of(h, typeof(*ccp), hnd); - if (!ccp->ld.passive) { + if (!ccp->ld.optional) { ppp_terminate(ccp->ppp, TERM_USER_ERROR, 0); return; } |