diff options
Diffstat (limited to 'usr.sbin/npppd/pptp')
| -rw-r--r-- | usr.sbin/npppd/pptp/pptp.h | 2 | ||||
| -rw-r--r-- | usr.sbin/npppd/pptp/pptp_call.c | 7 | ||||
| -rw-r--r-- | usr.sbin/npppd/pptp/pptp_ctrl.c | 6 | ||||
| -rw-r--r-- | usr.sbin/npppd/pptp/pptp_local.h | 2 | ||||
| -rw-r--r-- | usr.sbin/npppd/pptp/pptp_subr.c | 2 | ||||
| -rw-r--r-- | usr.sbin/npppd/pptp/pptp_subr.h | 2 | ||||
| -rw-r--r-- | usr.sbin/npppd/pptp/pptpd.c | 8 |
7 files changed, 14 insertions, 15 deletions
diff --git a/usr.sbin/npppd/pptp/pptp.h b/usr.sbin/npppd/pptp/pptp.h index bbefc5af350..00cdb88a188 100644 --- a/usr.sbin/npppd/pptp/pptp.h +++ b/usr.sbin/npppd/pptp/pptp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pptp.h,v 1.6 2011/10/15 03:24:11 yasuoka Exp $ */ +/* $OpenBSD: pptp.h,v 1.7 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. diff --git a/usr.sbin/npppd/pptp/pptp_call.c b/usr.sbin/npppd/pptp/pptp_call.c index b67da7f2698..49587359b66 100644 --- a/usr.sbin/npppd/pptp/pptp_call.c +++ b/usr.sbin/npppd/pptp/pptp_call.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pptp_call.c,v 1.5 2012/01/18 03:13:04 yasuoka Exp $ */ +/* $OpenBSD: pptp_call.c,v 1.6 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Id: pptp_call.c,v 1.5 2012/01/18 03:13:04 yasuoka Exp $ */ +/* $Id: pptp_call.c,v 1.6 2012/05/08 13:15:12 yasuoka Exp $ */ /**@file PPTP Call */ /* currently it supports PAC mode only */ #include <sys/types.h> @@ -125,7 +125,6 @@ pptp_call_init(pptp_call *_this, pptp_ctrl *ctrl) _this->snd_nxt = 1; return 0; - return 1; } int @@ -783,7 +782,7 @@ pptp_call_log(pptp_call *_this, int prio, const char *fmt, ...) va_list ap; va_start(ap, fmt); -#ifdef PPTPD_MULITPLE +#ifdef PPTPD_MULTIPLE snprintf(logbuf, sizeof(logbuf), "pptpd id=%u ctrl=%u call=%u %s", _this->ctrl->pptpd->id, _this->ctrl->id, _this->id, fmt); #else diff --git a/usr.sbin/npppd/pptp/pptp_ctrl.c b/usr.sbin/npppd/pptp/pptp_ctrl.c index fe82744d970..9d84bd85587 100644 --- a/usr.sbin/npppd/pptp/pptp_ctrl.c +++ b/usr.sbin/npppd/pptp/pptp_ctrl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pptp_ctrl.c,v 1.4 2011/03/16 09:48:45 okan Exp $ */ +/* $OpenBSD: pptp_ctrl.c,v 1.5 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -29,7 +29,7 @@ * PPTP(RFC 2637) control connection implementation. * currently it only support PAC part */ -/* $Id: pptp_ctrl.c,v 1.4 2011/03/16 09:48:45 okan Exp $ */ +/* $Id: pptp_ctrl.c,v 1.5 2012/05/08 13:15:12 yasuoka Exp $ */ #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -1148,7 +1148,7 @@ pptp_ctrl_log(pptp_ctrl *_this, int prio, const char *fmt, ...) va_list ap; va_start(ap, fmt); -#ifdef PPTPD_MULITPLE +#ifdef PPTPD_MULTIPLE snprintf(logbuf, sizeof(logbuf), "pptpd id=%u ctrl=%u %s", _this->pptpd->id, _this->id, fmt); #else diff --git a/usr.sbin/npppd/pptp/pptp_local.h b/usr.sbin/npppd/pptp/pptp_local.h index 182837d154a..a0820e65867 100644 --- a/usr.sbin/npppd/pptp/pptp_local.h +++ b/usr.sbin/npppd/pptp/pptp_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pptp_local.h,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */ +/* $OpenBSD: pptp_local.h,v 1.4 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. diff --git a/usr.sbin/npppd/pptp/pptp_subr.c b/usr.sbin/npppd/pptp/pptp_subr.c index 6d217aebeb3..5025ae17e8a 100644 --- a/usr.sbin/npppd/pptp/pptp_subr.c +++ b/usr.sbin/npppd/pptp/pptp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pptp_subr.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */ +/* $OpenBSD: pptp_subr.c,v 1.4 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. diff --git a/usr.sbin/npppd/pptp/pptp_subr.h b/usr.sbin/npppd/pptp/pptp_subr.h index 3d29b23437e..e642b27bb60 100644 --- a/usr.sbin/npppd/pptp/pptp_subr.h +++ b/usr.sbin/npppd/pptp/pptp_subr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pptp_subr.h,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */ +/* $OpenBSD: pptp_subr.h,v 1.4 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c index fd6cd8e921a..cb5b86bf78f 100644 --- a/usr.sbin/npppd/pptp/pptpd.c +++ b/usr.sbin/npppd/pptp/pptpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pptpd.c,v 1.9 2012/01/18 02:53:56 yasuoka Exp $ */ +/* $OpenBSD: pptpd.c,v 1.10 2012/05/08 13:15:12 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -25,12 +25,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Id: pptpd.c,v 1.9 2012/01/18 02:53:56 yasuoka Exp $ */ +/* $Id: pptpd.c,v 1.10 2012/05/08 13:15:12 yasuoka Exp $ */ /**@file * This file provides a implementation of PPTP daemon. Currently it * provides functions for PAC (PPTP Access Concentrator) only. - * $Id: pptpd.c,v 1.9 2012/01/18 02:53:56 yasuoka Exp $ + * $Id: pptpd.c,v 1.10 2012/05/08 13:15:12 yasuoka Exp $ */ #include <sys/types.h> #include <sys/param.h> @@ -1083,7 +1083,7 @@ pptpd_log(pptpd *_this, int prio, const char *fmt, ...) PPTPD_ASSERT(_this != NULL); va_start(ap, fmt); -#ifdef PPTPD_MULITPLE +#ifdef PPTPD_MULTIPLE snprintf(logbuf, sizeof(logbuf), "pptpd id=%u %s", _this->id, fmt); #else snprintf(logbuf, sizeof(logbuf), "pptpd %s", fmt); |