summaryrefslogtreecommitdiff
path: root/sbin/ipsecadm/ipsecadm.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2001-06-05 00:17:50 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2001-06-05 00:17:50 +0000
commit8e6c3e7c8786612ca32cd1b37fe373994f13ac4b (patch)
tree0d88ee4fd328942c00afd4789a231dc476155521 /sbin/ipsecadm/ipsecadm.c
parent47dae9154b0226f4c96808a892e9a390cbe0c28d (diff)
Make our pfkeyv2.h more RFC2367 compliant. Also fix some backwards
compatibility problems in isakmpd, at least 2.8 stable can compile current isakmpd now. angelos@ ok
Diffstat (limited to 'sbin/ipsecadm/ipsecadm.c')
-rw-r--r--sbin/ipsecadm/ipsecadm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/ipsecadm/ipsecadm.c b/sbin/ipsecadm/ipsecadm.c
index 0bbf79a8a99..f114c55e066 100644
--- a/sbin/ipsecadm/ipsecadm.c
+++ b/sbin/ipsecadm/ipsecadm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsecadm.c,v 1.54 2001/05/30 16:44:41 angelos Exp $ */
+/* $OpenBSD: ipsecadm.c,v 1.55 2001/06/05 00:17:47 niklas Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -1103,7 +1103,7 @@ main(int argc, char **argv)
{
/* Setup everything for a bypass flow */
bypass = 1;
- sprotocol2.sadb_protocol_proto = FLOW_X_TYPE_BYPASS;
+ sprotocol2.sadb_protocol_proto = SADB_X_FLOW_TYPE_BYPASS;
continue;
}
@@ -1112,7 +1112,7 @@ main(int argc, char **argv)
{
/* Setup everything for a deny flow */
deny = 1;
- sprotocol2.sadb_protocol_proto = FLOW_X_TYPE_DENY;
+ sprotocol2.sadb_protocol_proto = SADB_X_FLOW_TYPE_DENY;
continue;
}
@@ -1120,7 +1120,7 @@ main(int argc, char **argv)
!bypass && !ipsec)
{
ipsec = 1;
- sprotocol2.sadb_protocol_proto = FLOW_X_TYPE_USE;
+ sprotocol2.sadb_protocol_proto = SADB_X_FLOW_TYPE_USE;
continue;
}
@@ -1128,7 +1128,7 @@ main(int argc, char **argv)
!bypass && !ipsec)
{
ipsec = 1;
- sprotocol2.sadb_protocol_proto = FLOW_X_TYPE_ACQUIRE;
+ sprotocol2.sadb_protocol_proto = SADB_X_FLOW_TYPE_ACQUIRE;
continue;
}
@@ -1136,7 +1136,7 @@ main(int argc, char **argv)
!bypass && !ipsec)
{
ipsec = 1;
- sprotocol2.sadb_protocol_proto = FLOW_X_TYPE_REQUIRE;
+ sprotocol2.sadb_protocol_proto = SADB_X_FLOW_TYPE_REQUIRE;
continue;
}
@@ -1144,7 +1144,7 @@ main(int argc, char **argv)
!bypass && !ipsec)
{
ipsec = 1;
- sprotocol2.sadb_protocol_proto = FLOW_X_TYPE_DONTACQ;
+ sprotocol2.sadb_protocol_proto = SADB_X_FLOW_TYPE_DONTACQ;
continue;
}