summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/inet_aton.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-03 12:12:50 +1000
committerDamien Miller <djm@mindrot.org>2003-06-03 12:12:50 +1000
commit329638e49c00639d6616b58cda234ba2b3059022 (patch)
tree9b94f324c167827db854a98475a428346e65bbd6 /openbsd-compat/inet_aton.c
parent4636d93c0c772e63ea1c97d40467569f8658e8aa (diff)
- (djm) Sync openbsd-compat with OpenBSD CVS.
- No more 4-term BSD licenses in our tree
Diffstat (limited to 'openbsd-compat/inet_aton.c')
-rw-r--r--openbsd-compat/inet_aton.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c
index 86cf36c2..5de49868 100644
--- a/openbsd-compat/inet_aton.c
+++ b/openbsd-compat/inet_aton.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inet_addr.c,v 1.6 1999/05/03 22:31:14 yanick Exp $ */
+/* $OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $ */
/*
* Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -62,7 +58,7 @@
static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $";
#else
-static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.6 1999/05/03 22:31:14 yanick Exp $";
+static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */