summaryrefslogtreecommitdiffstats
path: root/usr.sbin/npppd
diff options
context:
space:
mode:
authordenis <denis@openbsd.org>2019-02-27 04:52:19 +0000
committerdenis <denis@openbsd.org>2019-02-27 04:52:19 +0000
commitbcb159dabaec0c8e55089ec3f1ffbd233e95b4b7 (patch)
tree9d1d4fe29886043944fb1976a864e2b6724c5252 /usr.sbin/npppd
parentAdjust to the last bgpd change. sa2addr gets an extra agrument and (diff)
downloadwireguard-openbsd-bcb159dabaec0c8e55089ec3f1ffbd233e95b4b7.tar.xz
wireguard-openbsd-bcb159dabaec0c8e55089ec3f1ffbd233e95b4b7.zip
remove unused includes
OK yasuoka@
Diffstat (limited to 'usr.sbin/npppd')
-rw-r--r--usr.sbin/npppd/npppd/ccp.c5
-rw-r--r--usr.sbin/npppd/npppd/chap.c5
-rw-r--r--usr.sbin/npppd/npppd/fsm.c3
-rw-r--r--usr.sbin/npppd/npppd/ipcp.c5
-rw-r--r--usr.sbin/npppd/npppd/lcp.c5
-rw-r--r--usr.sbin/npppd/npppd/mppe.c5
-rw-r--r--usr.sbin/npppd/npppd/npppd_auth.c5
-rw-r--r--usr.sbin/npppd/npppd/pap.c5
-rw-r--r--usr.sbin/npppd/npppd/parse.y3
-rw-r--r--usr.sbin/npppd/npppd/ppp.c6
10 files changed, 18 insertions, 29 deletions
diff --git a/usr.sbin/npppd/npppd/ccp.c b/usr.sbin/npppd/npppd/ccp.c
index 5775991caff..c0d8754fffc 100644
--- a/usr.sbin/npppd/npppd/ccp.c
+++ b/usr.sbin/npppd/npppd/ccp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccp.c,v 1.7 2015/12/05 18:43:36 mmcc Exp $ */
+/* $OpenBSD: ccp.c,v 1.8 2019/02/27 04:52:19 denis Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -28,7 +28,7 @@
/**@file
* This file provides functions for CCP (Compression Control Protocol).
* MPPE is supported as a CCP option.
- * $Id: ccp.c,v 1.7 2015/12/05 18:43:36 mmcc Exp $
+ * $Id: ccp.c,v 1.8 2019/02/27 04:52:19 denis Exp $
*/
#include <sys/types.h>
#include <sys/socket.h>
@@ -41,7 +41,6 @@
#include <string.h>
#include <event.h>
-#include "slist.h"
#include "npppd.h"
#include "fsm.h"
diff --git a/usr.sbin/npppd/npppd/chap.c b/usr.sbin/npppd/npppd/chap.c
index 1389e8f795d..b766aca4d19 100644
--- a/usr.sbin/npppd/npppd/chap.c
+++ b/usr.sbin/npppd/npppd/chap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap.c,v 1.15 2016/03/22 04:11:27 yasuoka Exp $ */
+/* $OpenBSD: chap.c,v 1.16 2019/02/27 04:52:19 denis Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -36,7 +36,7 @@
* </ul></p>
*/
/* RFC 1994, 2433 */
-/* $Id: chap.c,v 1.15 2016/03/22 04:11:27 yasuoka Exp $ */
+/* $Id: chap.c,v 1.16 2019/02/27 04:52:19 denis Exp $ */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
@@ -54,7 +54,6 @@
#include <md5.h>
#include <vis.h>
-#include "slist.h"
#include "npppd.h"
#include "ppp.h"
diff --git a/usr.sbin/npppd/npppd/fsm.c b/usr.sbin/npppd/npppd/fsm.c
index c566e7e9c9d..605b7887ed0 100644
--- a/usr.sbin/npppd/npppd/fsm.c
+++ b/usr.sbin/npppd/npppd/fsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsm.c,v 1.9 2017/05/30 17:22:00 yasuoka Exp $ */
+/* $OpenBSD: fsm.c,v 1.10 2019/02/27 04:52:19 denis Exp $ */
/**@file
* This file was adapted from NetBSD:/usr/src/usr.sbin/pppd/pppd/fsm.c
@@ -52,7 +52,6 @@
#include <time.h>
#include <event.h>
#include "debugutil.h"
-#include "slist.h"
#include "npppd.h"
#include "fsm.h"
diff --git a/usr.sbin/npppd/npppd/ipcp.c b/usr.sbin/npppd/npppd/ipcp.c
index a6b33dc34ca..f2f16efec84 100644
--- a/usr.sbin/npppd/npppd/ipcp.c
+++ b/usr.sbin/npppd/npppd/ipcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipcp.c,v 1.5 2012/09/18 13:14:08 yasuoka Exp $ */
+/* $OpenBSD: ipcp.c,v 1.6 2019/02/27 04:52:19 denis Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -32,7 +32,7 @@
/*
* RFC 1332, 1877
*/
-/* $Id: ipcp.c,v 1.5 2012/09/18 13:14:08 yasuoka Exp $ */
+/* $Id: ipcp.c,v 1.6 2019/02/27 04:52:19 denis Exp $ */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
@@ -46,7 +46,6 @@
#include <event.h>
#include "debugutil.h"
-#include "slist.h"
#include "npppd.h"
#ifdef IPCP_DEBUG
diff --git a/usr.sbin/npppd/npppd/lcp.c b/usr.sbin/npppd/npppd/lcp.c
index cd74b48e274..e132670259d 100644
--- a/usr.sbin/npppd/npppd/lcp.c
+++ b/usr.sbin/npppd/npppd/lcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcp.c,v 1.17 2017/05/30 17:22:00 yasuoka Exp $ */
+/* $OpenBSD: lcp.c,v 1.18 2019/02/27 04:52:19 denis 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: lcp.c,v 1.17 2017/05/30 17:22:00 yasuoka Exp $ */
+/* $Id: lcp.c,v 1.18 2019/02/27 04:52:19 denis Exp $ */
/**@file
* This file provides LCP related functions.
*<pre>
@@ -45,7 +45,6 @@
#include <event.h>
#include <ctype.h>
-#include "slist.h"
#include "npppd.h"
#include "ppp.h"
#include "psm-opt.h"
diff --git a/usr.sbin/npppd/npppd/mppe.c b/usr.sbin/npppd/npppd/mppe.c
index 3319d14bb8e..12e5843f4af 100644
--- a/usr.sbin/npppd/npppd/mppe.c
+++ b/usr.sbin/npppd/npppd/mppe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mppe.c,v 1.14 2017/05/30 17:22:00 yasuoka Exp $ */
+/* $OpenBSD: mppe.c,v 1.15 2019/02/27 04:52:19 denis 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: mppe.c,v 1.14 2017/05/30 17:22:00 yasuoka Exp $ */
+/* $Id: mppe.c,v 1.15 2019/02/27 04:52:19 denis Exp $ */
/**@file
*
* The implementation of MPPE(Microsoft Point-To-Point Encryption Protocol)
@@ -53,7 +53,6 @@
#include <openssl/rc4.h>
#endif
-#include "slist.h"
#include "npppd.h"
#include "debugutil.h"
diff --git a/usr.sbin/npppd/npppd/npppd_auth.c b/usr.sbin/npppd/npppd/npppd_auth.c
index a732050408d..499d04c87ba 100644
--- a/usr.sbin/npppd/npppd/npppd_auth.c
+++ b/usr.sbin/npppd/npppd/npppd_auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: npppd_auth.c,v 1.20 2017/08/11 16:41:47 goda Exp $ */
+/* $OpenBSD: npppd_auth.c,v 1.21 2019/02/27 04:52:19 denis Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
/**@file authentication realm */
-/* $Id: npppd_auth.c,v 1.20 2017/08/11 16:41:47 goda Exp $ */
+/* $Id: npppd_auth.c,v 1.21 2019/02/27 04:52:19 denis Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -44,7 +44,6 @@
#include <errno.h>
#include "debugutil.h"
-#include "slist.h"
#include "npppd_local.h"
#include "npppd_auth.h"
#include "net_utils.h"
diff --git a/usr.sbin/npppd/npppd/pap.c b/usr.sbin/npppd/npppd/pap.c
index 2738e669ee4..157b09b8c83 100644
--- a/usr.sbin/npppd/npppd/pap.c
+++ b/usr.sbin/npppd/npppd/pap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pap.c,v 1.10 2016/03/22 04:11:27 yasuoka Exp $ */
+/* $OpenBSD: pap.c,v 1.11 2019/02/27 04:52:19 denis 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: pap.c,v 1.10 2016/03/22 04:11:27 yasuoka Exp $ */
+/* $Id: pap.c,v 1.11 2019/02/27 04:52:19 denis Exp $ */
/**@file
* This file provides Password Authentication Protocol (PAP) handlers.
* @author Yasuoka Masahiko
@@ -46,7 +46,6 @@
#include <errno.h>
#include <vis.h>
-#include "slist.h"
#include "npppd.h"
#include "ppp.h"
diff --git a/usr.sbin/npppd/npppd/parse.y b/usr.sbin/npppd/npppd/parse.y
index 3c7aaa40220..5a3bf064869 100644
--- a/usr.sbin/npppd/npppd/parse.y
+++ b/usr.sbin/npppd/npppd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.23 2019/02/13 22:57:08 deraadt Exp $ */
+/* $OpenBSD: parse.y,v 1.24 2019/02/27 04:52:19 denis Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -42,7 +42,6 @@
#include <stdbool.h>
#include <stdarg.h>
#include "npppd_auth.h"
-#include "slist.h"
#include "npppd.h"
#ifdef USE_NPPPD_RADIUS
#include "radius_req.h"
diff --git a/usr.sbin/npppd/npppd/ppp.c b/usr.sbin/npppd/npppd/ppp.c
index 2402cb01a33..fd466fe8f6c 100644
--- a/usr.sbin/npppd/npppd/ppp.c
+++ b/usr.sbin/npppd/npppd/ppp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppp.c,v 1.27 2017/08/11 16:41:47 goda Exp $ */
+/* $OpenBSD: ppp.c,v 1.28 2019/02/27 04:52:19 denis 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: ppp.c,v 1.27 2017/08/11 16:41:47 goda Exp $ */
+/* $Id: ppp.c,v 1.28 2019/02/27 04:52:19 denis Exp $ */
/**@file
* This file provides PPP(Point-to-Point Protocol, RFC 1661) and
* {@link :: _npppd_ppp PPP instance} related functions.
@@ -47,8 +47,6 @@
#include <time.h>
#include <event.h>
-#include "slist.h"
-
#include "npppd.h"
#include "time_utils.h"
#include "ppp.h"