diff options
| -rw-r--r-- | accel-pptpd/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | accel-pptpd/ppp/ccp_mppe.c | 5 | ||||
| -rw-r--r-- | accel-pptpd/radius/radius.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/accel-pptpd/CMakeLists.txt b/accel-pptpd/CMakeLists.txt index a2c645f..a8a6c04 100644 --- a/accel-pptpd/CMakeLists.txt +++ b/accel-pptpd/CMakeLists.txt @@ -31,7 +31,6 @@ ADD_EXECUTABLE(accel-pptpd ipdb.c iprange.c - ippool.c utils.c sigchld.c @@ -42,3 +41,5 @@ ADD_EXECUTABLE(accel-pptpd ) TARGET_LINK_LIBRARIES(accel-pptpd triton rt pthread ssl) +ADD_LIBRARY(ippool SHARED ippool.c) + diff --git a/accel-pptpd/ppp/ccp_mppe.c b/accel-pptpd/ppp/ccp_mppe.c index 8958b52..3ac3ad6 100644 --- a/accel-pptpd/ppp/ccp_mppe.c +++ b/accel-pptpd/ppp/ccp_mppe.c @@ -155,7 +155,8 @@ static int mppe_recv_conf_req(struct ppp_ccp_t *ccp, struct ccp_option_t *opt, u return CCP_OPT_NAK; } else mppe_opt->mppe = 0; - } + } else + return CCP_OPT_REJ; if (setup_mppe_key(ccp->ppp->unit_fd, 1, mppe_opt->send_key)) return CCP_OPT_REJ; @@ -193,7 +194,7 @@ static void ev_mppe_keys(struct ev_mppe_keys_t *ev) { struct mppe_option_t *mppe_opt = container_of(ccp_find_option(ev->ppp, &mppe_opt_hnd), typeof(*mppe_opt), opt); - if ((ev->type & 0x02) == 0) { + if ((ev->type & 0x04) == 0) { log_ppp_warn("mppe: 128-bit session keys not allowed, disabling mppe ...\n"); return; } diff --git a/accel-pptpd/radius/radius.c b/accel-pptpd/radius/radius.c index fb5a2ca..99d9a3e 100644 --- a/accel-pptpd/radius/radius.c +++ b/accel-pptpd/radius/radius.c @@ -50,6 +50,8 @@ void rad_proc_attrs(struct rad_req_t *req) struct rad_attr_t *attr; list_for_each_entry(attr, &req->reply->attrs, entry) { + if (attr->vendor) + continue; switch(attr->attr->id) { case Framed_IP_Address: if (!conf_gw_ip_address) |