From 329638e49c00639d6616b58cda234ba2b3059022 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 3 Jun 2003 12:12:50 +1000 Subject: - (djm) Sync openbsd-compat with OpenBSD CVS. - No more 4-term BSD licenses in our tree --- openbsd-compat/inet_ntoa.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'openbsd-compat/inet_ntoa.c') diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index ac5f56708..e0384491d 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c @@ -10,11 +10,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. * @@ -36,7 +32,7 @@ #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.3 2002/06/27 10:14:01 itojun Exp $"; +static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* -- cgit v1.2.3 From 4dd222cb8747903750eea47be63305cfc9f1a483 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 19 Sep 2003 16:55:01 +1000 Subject: - (djm) Bug #680: Remove missing inet_ntoa.h header reference --- ChangeLog | 3 ++- openbsd-compat/inet_ntoa.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'openbsd-compat/inet_ntoa.c') diff --git a/ChangeLog b/ChangeLog index 692b17255..fb5e7d111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 20030919 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; djast AT cs.toronto.edu + - (djm) Bug #680: Remove missing inet_ntoa.h header reference 20030918 - (djm) Bug #652: Fix empty password auth @@ -1122,4 +1123,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2994.2.8 2003/09/19 06:31:31 djm Exp $ +$Id: ChangeLog,v 1.2994.2.9 2003/09/19 06:55:01 djm Exp $ diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index e0384491d..f9fdc9ee5 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c @@ -43,7 +43,6 @@ static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert E #include #include #include -#include "inet_ntoa.h" char *inet_ntoa(struct in_addr in) { -- cgit v1.2.3