Module Name: src
Committed By: maxv
Date: Thu Sep 6 09:54:36 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: libpfkey.h
src/crypto/dist/ipsec-tools/src/racoon: strnames.c
src/lib/libipsec: config.h
Log Message:
Remove dead references to netinet6/ipsec.h.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
cvs rdiff -u -r1.10 -r1.11 src/crypto/dist/ipsec-tools/src/racoon/strnames.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libipsec/config.h
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/libpfkey.h
diff -u src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.20 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.21
--- src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.20 Mon May 28 20:45:38 2018
+++ src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h Thu Sep 6 09:54:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: libpfkey.h,v 1.20 2018/05/28 20:45:38 maxv Exp $ */
+/* $NetBSD: libpfkey.h,v 1.21 2018/09/06 09:54:36 maxv Exp $ */
/* Id: libpfkey.h,v 1.13 2005/12/04 20:26:43 manubsd Exp */
@@ -53,7 +53,6 @@ extern void pfkey_spdump_withports(struc
struct sockaddr;
struct sadb_alg;
-/* Accomodate different prototypes in <netinet6/ipsec.h> */
#include <sys/types.h>
#include PATH_IPSEC_H
Index: src/crypto/dist/ipsec-tools/src/racoon/strnames.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/strnames.c:1.10 src/crypto/dist/ipsec-tools/src/racoon/strnames.c:1.11
--- src/crypto/dist/ipsec-tools/src/racoon/strnames.c:1.10 Thu Nov 29 15:31:25 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/strnames.c Thu Sep 6 09:54:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: strnames.c,v 1.10 2012/11/29 15:31:25 vanhu Exp $ */
+/* $NetBSD: strnames.c,v 1.11 2018/09/06 09:54:36 maxv Exp $ */
/* $KAME: strnames.c,v 1.25 2003/11/13 10:53:26 itojun Exp $ */
@@ -812,7 +812,6 @@ s_oakley_attr_v(type, val)
return num2str(val);
}
-/* netinet6/ipsec.h */
static struct ksmap name_ipsec_level[] = {
{ IPSEC_LEVEL_USE, "use", NULL },
{ IPSEC_LEVEL_REQUIRE, "require", NULL },
Index: src/lib/libipsec/config.h
diff -u src/lib/libipsec/config.h:1.8 src/lib/libipsec/config.h:1.9
--- src/lib/libipsec/config.h:1.8 Thu May 31 07:16:16 2018
+++ src/lib/libipsec/config.h Thu Sep 6 09:54:36 2018
@@ -91,9 +91,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Use <netinet6/ipsec.h> */
-#define HAVE_NETINET6_IPSEC
-
/* Define to 1 if you have the <openssl/aes.h> header file. */
#define HAVE_OPENSSL_AES_H 1
