diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-07 22:08:11 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-07 22:08:11 +0000 |
| commit | 62c211db8911e57794a0f7021d50334a40ab4d51 (patch) | |
| tree | d67fca5b03f6194c5ae26154b9cdfd555b0ffafd /sbin/isakmpd | |
| parent | 381440f81aa5b5a747c4f7bf8a8f22737e1c2d94 (diff) | |
isakmpd.8: Merge with EOM 1.14
pf_key_v2.c: Merge with EOM 1.17
author: niklas
Merge in fixes done in the OpenBSD tree
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/isakmpd.8 | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8 index 8dd6b7fe675..aff4af9a0c1 100644 --- a/sbin/isakmpd/isakmpd.8 +++ b/sbin/isakmpd/isakmpd.8 @@ -1,5 +1,5 @@ -.\" $OpenBSD: isakmpd.8,v 1.9 1999/07/03 02:11:07 aaron Exp $ -.\" $EOM: isakmpd.8,v 1.13 1998/12/21 00:09:36 niklas Exp $ +.\" $OpenBSD: isakmpd.8,v 1.10 1999/07/07 22:08:10 niklas Exp $ +.\" $EOM: isakmpd.8,v 1.14 1999/07/07 19:17:30 niklas Exp $ .\" .\" Copyright (c) 1998 Niklas Hallqvist. All rights reserved. .\" diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index de7549f169e..67ca90947d1 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pf_key_v2.c,v 1.12 1999/07/02 23:37:32 deraadt Exp $ */ -/* $EOM: pf_key_v2.c,v 1.16 1999/05/25 08:06:26 niklas Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.13 1999/07/07 22:08:10 niklas Exp $ */ +/* $EOM: pf_key_v2.c,v 1.17 1999/07/07 19:17:31 niklas Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. |