summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/conf.h
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/isakmpd/conf.h')
-rw-r--r--sbin/isakmpd/conf.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/sbin/isakmpd/conf.h b/sbin/isakmpd/conf.h
index 79b8953255b..fd886311498 100644
--- a/sbin/isakmpd/conf.h
+++ b/sbin/isakmpd/conf.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: conf.h,v 1.23 2003/05/15 00:28:53 ho Exp $ */
+/* $OpenBSD: conf.h,v 1.24 2003/06/03 14:28:16 ho Exp $ */
/* $EOM: conf.h,v 1.13 2000/09/18 00:01:47 ho Exp $ */
/*
* Copyright (c) 1998, 1999, 2001 Niklas Hallqvist. All rights reserved.
- * Copyright (c) 2000 Håkan Olsson. All rights reserved.
+ * Copyright (c) 2000, 2003 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
@@ -13,11 +13,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Ericsson Radio Systems.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES