diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 07:00:09 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 07:00:09 +0000 |
| commit | 4b9003711ea987ebfa82c617b8ed99a3e3949a19 (patch) | |
| tree | cade6dda812b7d7448338011ca86f470282a3cf2 /sbin | |
| parent | 474a8e779eccce5907e430a54589815289a8a890 (diff) | |
conf.h: Merge with EOM 1.13
gmp_util.c: Merge with EOM 1.7
isakmpd.conf.5: Merge with EOM 1.47
author: ho
(c)-2000
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/conf.h | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/gmp_util.c | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/isakmpd.conf.5 | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sbin/isakmpd/conf.h b/sbin/isakmpd/conf.h index 51544c59f9e..5c98a3b780b 100644 --- a/sbin/isakmpd/conf.h +++ b/sbin/isakmpd/conf.h @@ -1,8 +1,9 @@ -/* $OpenBSD: conf.h,v 1.11 2000/06/08 20:52:18 niklas Exp $ */ -/* $EOM: conf.h,v 1.12 2000/05/18 05:10:35 angelos Exp $ */ +/* $OpenBSD: conf.h,v 1.12 2000/10/07 07:00:06 niklas Exp $ */ +/* $EOM: conf.h,v 1.13 2000/09/18 00:01:47 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 2000 Håkan Olsson. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/isakmpd/gmp_util.c b/sbin/isakmpd/gmp_util.c index 02800d81abb..d0f626437f3 100644 --- a/sbin/isakmpd/gmp_util.c +++ b/sbin/isakmpd/gmp_util.c @@ -1,9 +1,10 @@ -/* $OpenBSD: gmp_util.c,v 1.8 2000/06/08 20:49:01 niklas Exp $ */ -/* $EOM: gmp_util.c,v 1.6 2000/05/08 13:42:43 ho Exp $ */ +/* $OpenBSD: gmp_util.c,v 1.9 2000/10/07 07:00:08 niklas Exp $ */ +/* $EOM: gmp_util.c,v 1.7 2000/09/18 00:01:47 ho Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. + * Copyright (c) 2000 Håkan Olsson. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5 index 95c7734a77a..26a49c0182b 100644 --- a/sbin/isakmpd/isakmpd.conf.5 +++ b/sbin/isakmpd/isakmpd.conf.5 @@ -1,7 +1,8 @@ -.\" $OpenBSD: isakmpd.conf.5,v 1.39 2000/08/03 07:24:14 niklas Exp $ -.\" $EOM: isakmpd.conf.5,v 1.46 2000/07/05 11:03:32 ho Exp $ +.\" $OpenBSD: isakmpd.conf.5,v 1.40 2000/10/07 07:00:08 niklas Exp $ +.\" $EOM: isakmpd.conf.5,v 1.47 2000/09/18 00:01:47 ho Exp $ .\" .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. +.\" Copyright (c) 2000 Håkan Olsson. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions |