diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-07 22:10:12 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-07 22:10:12 +0000 |
commit | 54d0324496cb1ad0b2238f35f75f7f03d6806580 (patch) | |
tree | b3beb0f844a5776ee25674906b292c82b43dcc9f /sbin/isakmpd | |
parent | 468f4c19b89d9dea452c6fb0016113aeba7d9951 (diff) |
Merge with EOM 1.96
author: ho
We no longer use flag "Stayalive"
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r-- | sbin/isakmpd/sa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c index 4fe19de7546..79fbefa2143 100644 --- a/sbin/isakmpd/sa.c +++ b/sbin/isakmpd/sa.c @@ -1,5 +1,5 @@ -/* $OpenBSD: sa.c,v 1.21 1999/06/02 06:29:35 niklas Exp $ */ -/* $EOM: sa.c,v 1.95 1999/05/30 14:12:33 niklas Exp $ */ +/* $OpenBSD: sa.c,v 1.22 1999/07/07 22:10:11 niklas Exp $ */ +/* $EOM: sa.c,v 1.96 1999/06/06 17:12:40 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -636,7 +636,6 @@ sa_flag (char *attr) char *name; int flag; } sa_flag_map[] = { - { "stayalive", SA_FLAG_STAYALIVE }, { "active-only", SA_FLAG_ACTIVE_ONLY } }; int i; |