[src/trunk]: src include <netipsec/ipsec.h> rather than <netinet6/ipsec.h> fr...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/518ba6e5e184
branches:  trunk
changeset: 772460:518ba6e5e184
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Jan 04 16:09:40 2012 +0000

description:
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))

diffstat:

 crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 |  4 ++--
 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3   |  4 ++--
 dist/dhcp/includes/dhcpd.h                              |  2 +-
 distrib/sets/lists/comp/mi                              |  3 ++-
 lib/libipsec/config.h                                   |  2 +-
 sbin/ping/ping.c                                        |  6 +++---
 sbin/ping6/ping6.c                                      |  6 +++---
 sbin/sysctl/sysctl.c                                    |  5 ++---
 sys/netipsec/Makefile                                   |  5 ++---
 usr.bin/telnet/externs.h                                |  4 ++--
 usr.sbin/inetd/inetd.c                                  |  6 +++---
 usr.sbin/inetd/ipsec.c                                  |  4 ++--
 usr.sbin/mountd/mountd.c                                |  6 +++---
 usr.sbin/traceroute/traceroute.c                        |  6 +++---
 usr.sbin/traceroute6/traceroute6.c                      |  6 +++---
 15 files changed, 34 insertions(+), 35 deletions(-)

diffs (truncated from 314 to 300 lines):

diff -r 29164d9c3ee0 -r 518ba6e5e184 crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3   Wed Jan 04 16:05:53 2012 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3   Wed Jan 04 16:09:40 2012 +0000
@@ -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
diff -r 29164d9c3ee0 -r 518ba6e5e184 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3     Wed Jan 04 16:05:53 2012 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.3     Wed Jan 04 16:09:40 2012 +0000
@@ -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
 .\"
diff -r 29164d9c3ee0 -r 518ba6e5e184 dist/dhcp/includes/dhcpd.h
--- a/dist/dhcp/includes/dhcpd.h        Wed Jan 04 16:05:53 2012 +0000
+++ b/dist/dhcp/includes/dhcpd.h        Wed Jan 04 16:09:40 2012 +0000
@@ -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>
diff -r 29164d9c3ee0 -r 518ba6e5e184 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Wed Jan 04 16:05:53 2012 +0000
+++ b/distrib/sets/lists/comp/mi        Wed Jan 04 16:09:40 2012 +0000
@@ -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
diff -r 29164d9c3ee0 -r 518ba6e5e184 lib/libipsec/config.h
--- a/lib/libipsec/config.h     Wed Jan 04 16:05:53 2012 +0000
+++ b/lib/libipsec/config.h     Wed Jan 04 16:09:40 2012 +0000
@@ -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>
diff -r 29164d9c3ee0 -r 518ba6e5e184 sbin/ping/ping.c
--- a/sbin/ping/ping.c  Wed Jan 04 16:05:53 2012 +0000
+++ b/sbin/ping/ping.c  Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 #include <netdb.h>
 
 #ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
 #endif /*IPSEC*/
 
 #include "prog_ops.h"
diff -r 29164d9c3ee0 -r 518ba6e5e184 sbin/ping6/ping6.c
--- a/sbin/ping6/ping6.c        Wed Jan 04 16:05:53 2012 +0000
+++ b/sbin/ping6/ping6.c        Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 #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 @@
 
 #ifdef IPSEC
 #include <netinet/ip6.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
 #endif
 
 #include <md5.h>
diff -r 29164d9c3ee0 -r 518ba6e5e184 sbin/sysctl/sysctl.c
--- a/sbin/sysctl/sysctl.c      Wed Jan 04 16:05:53 2012 +0000
+++ b/sbin/sysctl/sysctl.c      Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 #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 @@
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <machine/cpu.h>
-#include <netkey/key_var.h>
 
 #include <assert.h>
 #include <ctype.h>
diff -r 29164d9c3ee0 -r 518ba6e5e184 sys/netipsec/Makefile
--- a/sys/netipsec/Makefile     Wed Jan 04 16:05:53 2012 +0000
+++ b/sys/netipsec/Makefile     Wed Jan 04 16:09:40 2012 +0000
@@ -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>
diff -r 29164d9c3ee0 -r 518ba6e5e184 usr.bin/telnet/externs.h
--- a/usr.bin/telnet/externs.h  Wed Jan 04 16:05:53 2012 +0000
+++ b/usr.bin/telnet/externs.h  Wed Jan 04 16:09:40 2012 +0000
@@ -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;
diff -r 29164d9c3ee0 -r 518ba6e5e184 usr.sbin/inetd/inetd.c
--- a/usr.sbin/inetd/inetd.c    Wed Jan 04 16:05:53 2012 +0000
+++ b/usr.sbin/inetd/inetd.c    Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 #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 @@
 #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
diff -r 29164d9c3ee0 -r 518ba6e5e184 usr.sbin/inetd/ipsec.c
--- a/usr.sbin/inetd/ipsec.c    Wed Jan 04 16:05:53 2012 +0000
+++ b/usr.sbin/inetd/ipsec.c    Wed Jan 04 16:09:40 2012 +0000
@@ -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
diff -r 29164d9c3ee0 -r 518ba6e5e184 usr.sbin/mountd/mountd.c
--- a/usr.sbin/mountd/mountd.c  Wed Jan 04 16:05:53 2012 +0000
+++ b/usr.sbin/mountd/mountd.c  Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 #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 @@
 #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
diff -r 29164d9c3ee0 -r 518ba6e5e184 usr.sbin/traceroute/traceroute.c
--- a/usr.sbin/traceroute/traceroute.c  Wed Jan 04 16:05:53 2012 +0000
+++ b/usr.sbin/traceroute/traceroute.c  Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 __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 @@
 #include <poll.h>
 #ifdef IPSEC
 #include <net/route.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
 #endif
 
 #include "gnuc.h"
diff -r 29164d9c3ee0 -r 518ba6e5e184 usr.sbin/traceroute6/traceroute6.c
--- a/usr.sbin/traceroute6/traceroute6.c        Wed Jan 04 16:05:53 2012 +0000
+++ b/usr.sbin/traceroute6/traceroute6.c        Wed Jan 04 16:09:40 2012 +0000
@@ -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 @@
 #else
 #include <sys/cdefs.h>
 #ifndef lint