Adhere to the new set_spi prototype.

7 files changed, 27 insertions, 20 deletions

diff --git a/sbin/isakmpd/sysdep/bsdi/sysdep.c b/sbin/isakmpd/sysdep/bsdi/sysdep.c
index c394a874699..825f29c5ab6 100644
--- a/sbin/isakmpd/sysdep/bsdi/sysdep.c
+++ b/sbin/isakmpd/sysdep/bsdi/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.1 2001/03/23 16:14:35 markus Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.2 2001/05/05 00:51:46 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -186,10 +186,11 @@ sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
 }
 
 int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming)
+sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
+		      struct sa *isakmp_sa)
 {
   if (app_none)
     return 0;
-  return KEY_API (set_spi) (sa, proto, incoming);
+  return KEY_API (set_spi) (sa, proto, incoming, sa);
 }
 #endif
diff --git a/sbin/isakmpd/sysdep/freebsd/sysdep.c b/sbin/isakmpd/sysdep/freebsd/sysdep.c
index afdedde44a3..9f4a5eaf568 100644
--- a/sbin/isakmpd/sysdep/freebsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/freebsd/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.3 2001/02/24 03:59:56 angelos Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.4 2001/05/05 00:51:47 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -197,10 +197,11 @@ sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
 }
 
 int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming)
+sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
+		      struct sa *isakmp_sa)
 {
   if (app_none)
     return 0;
-  return KEY_API (set_spi) (sa, proto, incoming);
+  return KEY_API (set_spi) (sa, proto, incoming, isakmp_sa);
 }
 #endif
diff --git a/sbin/isakmpd/sysdep/linux/klips.c b/sbin/isakmpd/sysdep/linux/klips.c
index 34a03a78544..bfa83e3a068 100644
--- a/sbin/isakmpd/sysdep/linux/klips.c
+++ b/sbin/isakmpd/sysdep/linux/klips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: klips.c,v 1.4 2001/02/24 04:42:49 angelos Exp $	*/
+/*	$OpenBSD: klips.c,v 1.5 2001/05/05 00:51:48 angelos Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -209,7 +209,8 @@ klips_group_spis (struct sa *sa, struct proto *proto1, struct proto *proto2,
 
 /* Store/update a SPI with full information into the kernel.  */
 int
-klips_set_spi (struct sa *sa, struct proto *proto, int incoming)
+klips_set_spi (struct sa *sa, struct proto *proto, int incoming,
+	       struct sa *isakmp_sa)
 {
   struct encap_msghdr *emsg = 0;
   struct ipsec_proto *iproto = proto->data;
diff --git a/sbin/isakmpd/sysdep/linux/sysdep.c b/sbin/isakmpd/sysdep/linux/sysdep.c
index 12d77aff0ff..abeb44b7c8a 100644
--- a/sbin/isakmpd/sysdep/linux/sysdep.c
+++ b/sbin/isakmpd/sysdep/linux/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.5 2001/02/24 03:59:57 angelos Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.6 2001/05/05 00:51:48 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -159,8 +159,9 @@ sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
 }
 
 int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming)
+sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
+		      struct sa *isakmp_sa)
 {
-  return klips_set_spi (sa, proto, incoming);
+  return klips_set_spi (sa, proto, incoming, isakmp_sa);
 }
 #endif
diff --git a/sbin/isakmpd/sysdep/netbsd/sysdep.c b/sbin/isakmpd/sysdep/netbsd/sysdep.c
index 046d68011bf..f534da21042 100644
--- a/sbin/isakmpd/sysdep/netbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/netbsd/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.3 2001/02/24 03:59:58 angelos Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.4 2001/05/05 00:51:48 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -186,10 +186,11 @@ sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
 }
 
 int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming)
+sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
+		      struct sa *isakmp_sa)
 {
   if (app_none)
     return 0;
-  return KEY_API (set_spi) (sa, proto, incoming);
+  return KEY_API (set_spi) (sa, proto, incoming, isakmp_sa);
 }
 #endif
diff --git a/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c b/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c
index 367c5ed10da..eef756f5d08 100644
--- a/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd-encap/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.3 2001/02/24 03:59:59 angelos Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.4 2001/05/05 00:51:49 angelos Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -196,10 +196,11 @@ sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
 }
 
 int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming)
+sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
+		      struct sa *isakmp_sa)
 {
   if (app_none)
     return 0;
-  return KEY_API (set_spi) (sa, proto, incoming);
+  return KEY_API (set_spi) (sa, proto, incoming, isakmp_sa);
 }
 #endif
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c
index 22fbe0f3eb1..8b722a20c23 100644
--- a/sbin/isakmpd/sysdep/openbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep.c,v 1.8 2001/02/24 03:59:58 angelos Exp $	*/
+/*	$OpenBSD: sysdep.c,v 1.9 2001/05/05 00:51:49 angelos Exp $	*/
 /*	$EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $	*/
 
 /*
@@ -197,10 +197,11 @@ sysdep_ipsec_group_spis (struct sa *sa, struct proto *proto1,
 }
 
 int
-sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming)
+sysdep_ipsec_set_spi (struct sa *sa, struct proto *proto, int incoming,
+		      struct sa *isakmp_sa)
 {
   if (app_none)
     return 0;
-  return KEY_API (set_spi) (sa, proto, incoming);
+  return KEY_API (set_spi) (sa, proto, incoming, isakmp_sa);
 }
 #endif