Module Name: src
Committed By: drochner
Date: Wed Jan 4 16:09:44 UTC 2012
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: ipsec_set_policy.3
ipsec_strerror.3
src/dist/dhcp/includes: dhcpd.h
src/distrib/sets/lists/comp: mi
src/lib/libipsec: config.h
src/sbin/ping: ping.c
src/sbin/ping6: ping6.c
src/sbin/sysctl: sysctl.c
src/sys/netipsec: Makefile
src/usr.bin/telnet: externs.h
src/usr.sbin/inetd: inetd.c ipsec.c
src/usr.sbin/mountd: mountd.c
src/usr.sbin/traceroute: traceroute.c
src/usr.sbin/traceroute6: traceroute6.c
Log Message:
include <netipsec/ipsec.h> rather than <netinet6/ipsec.h> from userland
where possible, for consistency and compatibility to FreeBSD
(exception: KAME specific statistics gathering in netstat(1) and systat(1))
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
cvs rdiff -u -r1.9 -r1.10 src/dist/dhcp/includes/dhcpd.h
cvs rdiff -u -r1.1720 -r1.1721 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.6 -r1.7 src/lib/libipsec/config.h
cvs rdiff -u -r1.101 -r1.102 src/sbin/ping/ping.c
cvs rdiff -u -r1.79 -r1.80 src/sbin/ping6/ping6.c
cvs rdiff -u -r1.138 -r1.139 src/sbin/sysctl/sysctl.c
cvs rdiff -u -r1.3 -r1.4 src/sys/netipsec/Makefile
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/telnet/externs.h
cvs rdiff -u -r1.119 -r1.120 src/usr.sbin/inetd/inetd.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/inetd/ipsec.c
cvs rdiff -u -r1.123 -r1.124 src/usr.sbin/mountd/mountd.c
cvs rdiff -u -r1.79 -r1.80 src/usr.sbin/traceroute/traceroute.c
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/traceroute6/traceroute6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.16 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.17
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.16 Wed Jan 4 15:55:35 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 Wed Jan 4 16:09:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipsec_set_policy.3,v 1.16 2012/01/04 15:55:35 drochner Exp $
+.\" $NetBSD: ipsec_set_policy.3,v 1.17 2012/01/04 16:09:40 drochner Exp $
.\"
.\" $KAME: ipsec_set_policy.3,v 1.16 2003/01/06 21:59:03 sumikawa Exp $
.\"
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libipsec
.Sh SYNOPSIS
-.In netinet6/ipsec.h
+.In netipsec/ipsec.h
.Ft "char *"
.Fn ipsec_set_policy "const char *policy" "int len"
.Ft int
Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3:1.10 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3:1.11
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3:1.10 Sat Sep 9 16:22:09 2006
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3 Wed Jan 4 16:09:40 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipsec_strerror.3,v 1.10 2006/09/09 16:22:09 manu Exp $
+.\" $NetBSD: ipsec_strerror.3,v 1.11 2012/01/04 16:09:40 drochner Exp $
.\"
.\" $KAME: ipsec_strerror.3,v 1.9 2001/08/17 07:21:36 itojun Exp $
.\"
@@ -40,7 +40,7 @@
.Sh LIBRARY
.Lb libipsec
.Sh SYNOPSIS
-.In netinet6/ipsec.h
+.In netipsec/ipsec.h
.Ft "const char *"
.Fn ipsec_strerror void
.\"
Index: src/dist/dhcp/includes/dhcpd.h
diff -u src/dist/dhcp/includes/dhcpd.h:1.9 src/dist/dhcp/includes/dhcpd.h:1.10
--- src/dist/dhcp/includes/dhcpd.h:1.9 Thu Aug 11 17:13:21 2005
+++ src/dist/dhcp/includes/dhcpd.h Wed Jan 4 16:09:40 2012
@@ -36,7 +36,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#ifndef SMALL
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#endif
#include <sys/socket.h>
#include <sys/un.h>
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1720 src/distrib/sets/lists/comp/mi:1.1721
--- src/distrib/sets/lists/comp/mi:1.1720 Wed Jan 4 15:54:37 2012
+++ src/distrib/sets/lists/comp/mi Wed Jan 4 16:09:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1720 2012/01/04 15:54:37 yamt Exp $
+# $NetBSD: mi,v 1.1721 2012/01/04 16:09:41 drochner Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1963,6 +1963,7 @@
./usr/include/netipsec/esp_var.h comp-c-include
./usr/include/netipsec/ipcomp_var.h comp-c-include
./usr/include/netipsec/ipip_var.h comp-c-include
+./usr/include/netipsec/ipsec.h comp-c-include
./usr/include/netipsec/ipsec_var.h comp-c-include
./usr/include/netipsec/keydb.h comp-c-include
./usr/include/netisdn/i4b_cause.h comp-c-include
Index: src/lib/libipsec/config.h
diff -u src/lib/libipsec/config.h:1.6 src/lib/libipsec/config.h:1.7
--- src/lib/libipsec/config.h:1.6 Wed Jan 4 15:55:36 2012
+++ src/lib/libipsec/config.h Wed Jan 4 16:09:42 2012
@@ -246,4 +246,4 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
-#define PATH_IPSEC_H <netinet6/ipsec.h>
+#define PATH_IPSEC_H <netipsec/ipsec.h>
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.101 src/sbin/ping/ping.c:1.102
--- src/sbin/ping/ping.c:1.101 Sun Sep 11 17:18:52 2011
+++ src/sbin/ping/ping.c Wed Jan 4 16:09:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.101 2011/09/11 17:18:52 christos Exp $ */
+/* $NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.101 2011/09/11 17:18:52 christos Exp $");
+__RCSID("$NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $");
#endif
#include <stdio.h>
@@ -89,7 +89,7 @@ __RCSID("$NetBSD: ping.c,v 1.101 2011/09
#include <netdb.h>
#ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#endif /*IPSEC*/
#include "prog_ops.h"
Index: src/sbin/ping6/ping6.c
diff -u src/sbin/ping6/ping6.c:1.79 src/sbin/ping6/ping6.c:1.80
--- src/sbin/ping6/ping6.c:1.79 Wed Jan 4 15:55:36 2012
+++ src/sbin/ping6/ping6.c Wed Jan 4 16:09:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ping6.c,v 1.79 2012/01/04 15:55:36 drochner Exp $ */
+/* $NetBSD: ping6.c,v 1.80 2012/01/04 16:09:42 drochner Exp $ */
/* $KAME: ping6.c,v 1.164 2002/11/16 14:05:37 itojun Exp $ */
/*
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping6.c,v 1.79 2012/01/04 15:55:36 drochner Exp $");
+__RCSID("$NetBSD: ping6.c,v 1.80 2012/01/04 16:09:42 drochner Exp $");
#endif
#endif
@@ -133,7 +133,7 @@ __RCSID("$NetBSD: ping6.c,v 1.79 2012/01
#ifdef IPSEC
#include <netinet/ip6.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#endif
#include <md5.h>
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.138 src/sbin/sysctl/sysctl.c:1.139
--- src/sbin/sysctl/sysctl.c:1.138 Mon Aug 29 14:35:04 2011
+++ src/sbin/sysctl/sysctl.c Wed Jan 4 16:09:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.138 2011/08/29 14:35:04 joerg Exp $ */
+/* $NetBSD: sysctl.c,v 1.139 2012/01/04 16:09:42 drochner Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.138 2011/08/29 14:35:04 joerg Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.139 2012/01/04 16:09:42 drochner Exp $");
#endif
#endif /* not lint */
@@ -90,7 +90,6 @@ __RCSID("$NetBSD: sysctl.c,v 1.138 2011/
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <machine/cpu.h>
-#include <netkey/key_var.h>
#include <assert.h>
#include <ctype.h>
Index: src/sys/netipsec/Makefile
diff -u src/sys/netipsec/Makefile:1.3 src/sys/netipsec/Makefile:1.4
--- src/sys/netipsec/Makefile:1.3 Wed Jan 4 15:55:36 2012
+++ src/sys/netipsec/Makefile Wed Jan 4 16:09:43 2012
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2012/01/04 15:55:36 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/04 16:09:43 drochner Exp $
INCSDIR= /usr/include/netipsec
INCS= ah_var.h esp_var.h ipcomp_var.h ipip_var.h ipsec_var.h \
keydb.h
-# notyet
-#INCS+= ipsec.h
+INCS+= ipsec.h
.include <bsd.kinc.mk>
Index: src/usr.bin/telnet/externs.h
diff -u src/usr.bin/telnet/externs.h:1.34 src/usr.bin/telnet/externs.h:1.35
--- src/usr.bin/telnet/externs.h:1.34 Thu Feb 2 19:33:12 2006
+++ src/usr.bin/telnet/externs.h Wed Jan 4 16:09:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.34 2006/02/02 19:33:12 he Exp $ */
+/* $NetBSD: externs.h,v 1.35 2012/01/04 16:09:43 drochner Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -41,7 +41,7 @@
#include <string.h>
#if defined(IPSEC)
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#if defined(IPSEC_POLICY_IPSEC)
extern char *ipsec_policy_in;
extern char *ipsec_policy_out;
Index: src/usr.sbin/inetd/inetd.c
diff -u src/usr.sbin/inetd/inetd.c:1.119 src/usr.sbin/inetd/inetd.c:1.120
--- src/usr.sbin/inetd/inetd.c:1.119 Wed Aug 31 13:32:37 2011
+++ src/usr.sbin/inetd/inetd.c Wed Jan 4 16:09:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: inetd.c,v 1.119 2011/08/31 13:32:37 joerg Exp $ */
+/* $NetBSD: inetd.c,v 1.120 2012/01/04 16:09:43 drochner Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94";
#else
-__RCSID("$NetBSD: inetd.c,v 1.119 2011/08/31 13:32:37 joerg Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.120 2012/01/04 16:09:43 drochner Exp $");
#endif
#endif /* not lint */
@@ -226,7 +226,7 @@ __RCSID("$NetBSD: inetd.c,v 1.119 2011/0
#include "pathnames.h"
#ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#ifndef IPSEC_POLICY_IPSEC /* no ipsec support on old ipsec */
#undef IPSEC
#endif
Index: src/usr.sbin/inetd/ipsec.c
diff -u src/usr.sbin/inetd/ipsec.c:1.3 src/usr.sbin/inetd/ipsec.c:1.4
--- src/usr.sbin/inetd/ipsec.c:1.3 Thu Jan 8 21:37:20 2009
+++ src/usr.sbin/inetd/ipsec.c Wed Jan 4 16:09:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.3 2009/01/08 21:37:20 christos Exp $ */
+/* $NetBSD: ipsec.c,v 1.4 2012/01/04 16:09:43 drochner Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -43,7 +43,7 @@
#include <ctype.h>
#ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#ifndef IPSEC_POLICY_IPSEC /* no ipsec support on old ipsec */
#undef IPSEC
#endif
Index: src/usr.sbin/mountd/mountd.c
diff -u src/usr.sbin/mountd/mountd.c:1.123 src/usr.sbin/mountd/mountd.c:1.124
--- src/usr.sbin/mountd/mountd.c:1.123 Wed Nov 2 18:09:44 2011
+++ src/usr.sbin/mountd/mountd.c Wed Jan 4 16:09:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mountd.c,v 1.123 2011/11/02 18:09:44 christos Exp $ */
+/* $NetBSD: mountd.c,v 1.124 2012/01/04 16:09:44 drochner Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: mountd.c,v 1.123 2011/11/02 18:09:44 christos Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.124 2012/01/04 16:09:44 drochner Exp $");
#endif
#endif /* not lint */
@@ -82,7 +82,7 @@ __RCSID("$NetBSD: mountd.c,v 1.123 2011/
#include "pathnames.h"
#ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#ifndef IPSEC_POLICY_IPSEC /* no ipsec support on old ipsec */
#undef IPSEC
#endif
Index: src/usr.sbin/traceroute/traceroute.c
diff -u src/usr.sbin/traceroute/traceroute.c:1.79 src/usr.sbin/traceroute/traceroute.c:1.80
--- src/usr.sbin/traceroute/traceroute.c:1.79 Sun Sep 11 01:06:26 2011
+++ src/usr.sbin/traceroute/traceroute.c Wed Jan 4 16:09:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute.c,v 1.79 2011/09/11 01:06:26 christos Exp $ */
+/* $NetBSD: traceroute.c,v 1.80 2012/01/04 16:09:44 drochner Exp $ */
/*
* Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000
@@ -30,7 +30,7 @@ static const char rcsid[] =
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997,\
1998, 1999, 2000\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: traceroute.c,v 1.79 2011/09/11 01:06:26 christos Exp $");
+__RCSID("$NetBSD: traceroute.c,v 1.80 2012/01/04 16:09:44 drochner Exp $");
#endif
#endif
@@ -237,7 +237,7 @@ __RCSID("$NetBSD: traceroute.c,v 1.79 20
#include <poll.h>
#ifdef IPSEC
#include <net/route.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#endif
#include "gnuc.h"
Index: src/usr.sbin/traceroute6/traceroute6.c
diff -u src/usr.sbin/traceroute6/traceroute6.c:1.41 src/usr.sbin/traceroute6/traceroute6.c:1.42
--- src/usr.sbin/traceroute6/traceroute6.c:1.41 Sun May 15 00:06:23 2011
+++ src/usr.sbin/traceroute6/traceroute6.c Wed Jan 4 16:09:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute6.c,v 1.41 2011/05/15 00:06:23 wiz Exp $ */
+/* $NetBSD: traceroute6.c,v 1.42 2012/01/04 16:09:44 drochner Exp $ */
/* $KAME: traceroute6.c,v 1.67 2004/01/25 03:24:39 itojun Exp $ */
/*
@@ -75,7 +75,7 @@ static char sccsid[] = "@(#)traceroute.c
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: traceroute6.c,v 1.41 2011/05/15 00:06:23 wiz Exp $");
+__RCSID("$NetBSD: traceroute6.c,v 1.42 2012/01/04 16:09:44 drochner Exp $");
#endif
#endif
@@ -279,7 +279,7 @@ __RCSID("$NetBSD: traceroute6.c,v 1.41 2
#ifdef IPSEC
#include <net/route.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#endif
#include "as.h"
