diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-01 02:46:20 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-01 02:46:20 +0000 |
| commit | 3f6dffc08fd1386299c959a6613728c3c7925414 (patch) | |
| tree | 08f77ad5375913afd7d48eac5a4763b6e9a302d7 /sbin/isakmpd/isakmpd.c | |
| parent | a9ef0055d23c9d5f4840c2efb1c4585b5892f1ae (diff) | |
apps/certpatch/certpatch.8: Merge with EOM 1.4
apps/certpatch/certpatch.c: Merge with EOM 1.6
exchange.c: Merge with EOM 1.114
ike_quick_mode.c: Merge with EOM 1.110
ike_phase_1.c: Merge with EOM 1.16
ike_auth.c: Merge with EOM 1.41
ike_aggressive.c: Merge with EOM 1.4
libcrypto.c: Merge with EOM 1.10
libcrypto.h: Merge with EOM 1.10
isakmpd.8: Merge with EOM 1.19
isakmpd.c: Merge with EOM 1.42
ipsec.h: Merge with EOM 1.40
init.c: Merge with EOM 1.22
message.c: Merge with EOM 1.143
message.h: Merge with EOM 1.49
sa.c: Merge with EOM 1.98
sa.h: Merge with EOM 1.54
policy.c: Merge with EOM 1.14
pf_key_v2.c: Merge with EOM 1.36
x509.c: Merge with EOM 1.32
x509.h: Merge with EOM 1.9
udp.c: Merge with EOM 1.46
author: niklas
Angelos copyrights
Diffstat (limited to 'sbin/isakmpd/isakmpd.c')
| -rw-r--r-- | sbin/isakmpd/isakmpd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c index 10ba8a7d470..1cac9249bb1 100644 --- a/sbin/isakmpd/isakmpd.c +++ b/sbin/isakmpd/isakmpd.c @@ -1,8 +1,9 @@ -/* $OpenBSD: isakmpd.c,v 1.17 2000/01/31 08:18:54 niklas Exp $ */ -/* $EOM: isakmpd.c,v 1.41 2000/01/31 05:50:59 angelos Exp $ */ +/* $OpenBSD: isakmpd.c,v 1.18 2000/02/01 02:46:18 niklas Exp $ */ +/* $EOM: isakmpd.c,v 1.42 2000/01/31 22:33:46 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1999, 2000 Angelos D. Keromytis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |