[src/trunk]: src/sys/netinet6 fix IPSEC (but not INET6) build.

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

details:   https://anonhg.NetBSD.org/src/rev/18a6adccfdd5
branches:  trunk
changeset: 474419:18a6adccfdd5
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Jul 06 05:09:22 1999 +0000

description:
fix IPSEC (but not INET6) build.

PR: 7921, 7922, 7924
From: rafal%mediaone.net@localhost

diffstat:

 sys/netinet6/ah_core.c       |   4 +++-
 sys/netinet6/ipcomp_input.c  |   4 +---
 sys/netinet6/ipcomp_output.c |   4 +---
 sys/netinet6/ipsec.c         |  12 ++++++------
 4 files changed, 11 insertions(+), 13 deletions(-)

diffs (92 lines):

diff -r 923574f96d88 -r 18a6adccfdd5 sys/netinet6/ah_core.c
--- a/sys/netinet6/ah_core.c    Tue Jul 06 02:31:05 1999 +0000
+++ b/sys/netinet6/ah_core.c    Tue Jul 06 05:09:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_core.c,v 1.4 1999/07/04 02:01:15 itojun Exp $       */
+/*     $NetBSD: ah_core.c,v 1.5 1999/07/06 05:09:22 itojun Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,8 +98,10 @@
 
 #define        HMACSIZE        16
 
+#ifdef INET6
 #define ZEROBUFLEN     256
 static char zerobuf[ZEROBUFLEN];
+#endif
 
 static int ah_sumsiz_1216 __P((struct secas *));
 static int ah_sumsiz_zero __P((struct secas *));
diff -r 923574f96d88 -r 18a6adccfdd5 sys/netinet6/ipcomp_input.c
--- a/sys/netinet6/ipcomp_input.c       Tue Jul 06 02:31:05 1999 +0000
+++ b/sys/netinet6/ipcomp_input.c       Tue Jul 06 05:09:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipcomp_input.c,v 1.3 1999/07/03 21:30:19 thorpej Exp $ */
+/*     $NetBSD: ipcomp_input.c,v 1.4 1999/07/06 05:09:22 itojun Exp $  */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -72,9 +72,7 @@
 #endif
 #include <netinet6/ipcomp.h>
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
 #include <netinet6/ipsec.h>
-#endif
 #include <netkey/key.h>
 #include <netkey/keydb.h>
 #include <netkey/key_debug.h>
diff -r 923574f96d88 -r 18a6adccfdd5 sys/netinet6/ipcomp_output.c
--- a/sys/netinet6/ipcomp_output.c      Tue Jul 06 02:31:05 1999 +0000
+++ b/sys/netinet6/ipcomp_output.c      Tue Jul 06 05:09:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipcomp_output.c,v 1.3 1999/07/03 21:30:19 thorpej Exp $        */
+/*     $NetBSD: ipcomp_output.c,v 1.4 1999/07/06 05:09:22 itojun Exp $ */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -72,9 +72,7 @@
 #endif
 #include <netinet6/ipcomp.h>
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
 #include <netinet6/ipsec.h>
-#endif
 #include <netkey/key.h>
 #include <netkey/keydb.h>
 #include <netkey/key_debug.h>
diff -r 923574f96d88 -r 18a6adccfdd5 sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Tue Jul 06 02:31:05 1999 +0000
+++ b/sys/netinet6/ipsec.c      Tue Jul 06 05:09:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.4 1999/07/04 02:01:15 itojun Exp $ */
+/*     $NetBSD: ipsec.c,v 1.5 1999/07/06 05:09:22 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -3074,19 +3074,19 @@
                        }
                }
                return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip6_def_policy.policy);
+                                 &ip4_def_policy.policy);
        case IPSECCTL_DEF_ESP_TRANSLEV:
                return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip6_esp_trans_deflev);
+                                 &ip4_esp_trans_deflev);
        case IPSECCTL_DEF_ESP_NETLEV:
                return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip6_esp_net_deflev);
+                                 &ip4_esp_net_deflev);
        case IPSECCTL_DEF_AH_TRANSLEV:
                return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip6_ah_trans_deflev);
+                                 &ip4_ah_trans_deflev);
        case IPSECCTL_DEF_AH_NETLEV:
                return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip6_ah_net_deflev);
+                                 &ip4_ah_net_deflev);
        case IPSECCTL_INBOUND_CALL_IKE:
                return sysctl_int(oldp, oldlenp, newp, newlen,
                                  &ip4_inbound_call_ike);