summaryrefslogtreecommitdiff
path: root/usr.sbin/npppd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/npppd')
-rw-r--r--usr.sbin/npppd/common/ipsec_util.c3
-rw-r--r--usr.sbin/npppd/npppd/fsm.c3
-rw-r--r--usr.sbin/npppd/pppoe/pppoe_session.c5
3 files changed, 4 insertions, 7 deletions
diff --git a/usr.sbin/npppd/common/ipsec_util.c b/usr.sbin/npppd/common/ipsec_util.c
index 943201dda56..23e43420e01 100644
--- a/usr.sbin/npppd/common/ipsec_util.c
+++ b/usr.sbin/npppd/common/ipsec_util.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $Id: ipsec_util.c,v 1.5 2012/05/08 13:18:37 yasuoka Exp $ */
+/* $Id: ipsec_util.c,v 1.6 2014/11/18 20:54:28 krw Exp $ */
/*@file IPsec related utility functions */
/*
* RFC 2367 PF_KEY Key Management API, Version 2
@@ -31,7 +31,6 @@
#include <sys/param.h>
#include <sys/socket.h>
-#include <sys/socket.h>
#include <sys/errno.h>
#include <net/pfkeyv2.h>
#include <netinet/in.h>
diff --git a/usr.sbin/npppd/npppd/fsm.c b/usr.sbin/npppd/npppd/fsm.c
index d555213c70d..1a26be4ec3d 100644
--- a/usr.sbin/npppd/npppd/fsm.c
+++ b/usr.sbin/npppd/npppd/fsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsm.c,v 1.5 2012/12/05 23:20:26 deraadt Exp $ */
+/* $OpenBSD: fsm.c,v 1.6 2014/11/18 20:54:28 krw Exp $ */
/**@file
* This file was adapted from NetBSD:/usr/src/usr.sbin/pppd/pppd/fsm.c
@@ -50,7 +50,6 @@
#include <netinet/in.h>
#include <net/if_dl.h>
#include <time.h>
-#include <sys/time.h>
#include <event.h>
#include "debugutil.h"
#include "slist.h"
diff --git a/usr.sbin/npppd/pppoe/pppoe_session.c b/usr.sbin/npppd/pppoe/pppoe_session.c
index 982bcf7d556..e81348878a3 100644
--- a/usr.sbin/npppd/pppoe/pppoe_session.c
+++ b/usr.sbin/npppd/pppoe/pppoe_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pppoe_session.c,v 1.7 2012/09/18 13:14:08 yasuoka Exp $ */
+/* $OpenBSD: pppoe_session.c,v 1.8 2014/11/18 20:54:28 krw Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -28,7 +28,7 @@
/**@file
* Session management of PPPoE protocol
- * $Id: pppoe_session.c,v 1.7 2012/09/18 13:14:08 yasuoka Exp $
+ * $Id: pppoe_session.c,v 1.8 2014/11/18 20:54:28 krw Exp $
*/
#include <sys/types.h>
@@ -49,7 +49,6 @@
#include <stdio.h>
#include <event.h>
#include <syslog.h>
-#include <stdlib.h>
#include <stdarg.h>
#include "hash.h"