diff options
Diffstat (limited to 'accel-pptpd/auth/auth_chap_md5.c')
| -rw-r--r-- | accel-pptpd/auth/auth_chap_md5.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/accel-pptpd/auth/auth_chap_md5.c b/accel-pptpd/auth/auth_chap_md5.c index 634fba2..d19634a 100644 --- a/accel-pptpd/auth/auth_chap_md5.c +++ b/accel-pptpd/auth/auth_chap_md5.c @@ -89,13 +89,13 @@ static void print_buf(const uint8_t *buf, int size) { int i; for (i=0; i < size; i++) - log_ppp_info("%x", buf[i]); + log_ppp_info2("%x", buf[i]); } static void print_str(const char *buf, int size) { int i; for (i = 0; i < size; i++) - log_ppp_info("%c", buf[i]); + log_ppp_info2("%c", buf[i]); } static struct auth_data_t* auth_data_init(struct ppp_t *ppp) @@ -166,7 +166,7 @@ static void chap_timeout_timer(struct triton_timer_t *t) if (d->started) ppp_terminate(d->ppp, TERM_USER_ERROR, 0); else - ppp_auth_failed(d->ppp); + ppp_auth_failed(d->ppp, NULL); } else { --d->id; chap_send_challenge(d); @@ -204,7 +204,7 @@ static void chap_send_failure(struct chap_auth_data_t *ad) }; if (conf_ppp_verbose) - log_ppp_info("send [CHAP Failure id=%x \"%s\"]\n", msg.hdr.id, MSG_FAILURE); + log_ppp_info2("send [CHAP Failure id=%x \"%s\"]\n", msg.hdr.id, MSG_FAILURE); ppp_chan_send(ad->ppp, &msg, ntohs(msg.hdr.len) + 2); } @@ -220,7 +220,7 @@ static void chap_send_success(struct chap_auth_data_t *ad) }; if (conf_ppp_verbose) - log_ppp_info("send [CHAP Success id=%x \"%s\"]\n", msg.hdr.id, MSG_SUCCESS); + log_ppp_info2("send [CHAP Success id=%x \"%s\"]\n", msg.hdr.id, MSG_SUCCESS); ppp_chan_send(ad->ppp, &msg, ntohs(msg.hdr.len) + 2); } @@ -239,9 +239,9 @@ static void chap_send_challenge(struct chap_auth_data_t *ad) memcpy(msg.val, ad->val, VALUE_SIZE); if (conf_ppp_verbose) { - log_ppp_info("send [CHAP Challenge id=%x <", msg.hdr.id); + log_ppp_info2("send [CHAP Challenge id=%x <", msg.hdr.id); print_buf(msg.val, VALUE_SIZE); - log_ppp_info(">]\n"); + log_ppp_info2(">]\n"); } ppp_chan_send(ad->ppp, &msg, ntohs(msg.hdr.len) + 2); @@ -263,11 +263,11 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h triton_timer_del(&ad->timeout); if (conf_ppp_verbose) { - log_ppp_info("recv [CHAP Response id=%x <", msg->hdr.id); + log_ppp_info2("recv [CHAP Response id=%x <", msg->hdr.id); print_buf(msg->val, msg->val_size); - log_ppp_info(">, name=\""); + log_ppp_info2(">, name=\""); print_str(msg->name, ntohs(msg->hdr.len) - sizeof(*msg) + 2); - log_ppp_info("\"]\n"); + log_ppp_info2("\"]\n"); } if (msg->hdr.id != ad->id) { @@ -319,9 +319,9 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h if (ad->started) ppp_terminate(ad->ppp, TERM_USER_ERROR, 0); else - ppp_auth_failed(ad->ppp); - }else - { + ppp_auth_failed(ad->ppp, name); + _free(name); + } else { chap_send_success(ad); if (!ad->started) { ad->started = 1; @@ -334,11 +334,11 @@ static void chap_recv_response(struct chap_auth_data_t *ad, struct chap_hdr_t *h _free(passwd); } else if (r == PWDB_DENIED) { chap_send_failure(ad); - _free(name); if (ad->started) ppp_terminate(ad->ppp, TERM_USER_ERROR, 0); else - ppp_auth_failed(ad->ppp); + ppp_auth_failed(ad->ppp, name); + _free(name); } else { chap_send_success(ad); if (!ad->started) { |