summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/inet_ntoa.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-03 04:12:50 +0200
committerDamien Miller <djm@mindrot.org>2003-06-03 04:12:50 +0200
commit329638e49c00639d6616b58cda234ba2b3059022 (patch)
tree9b94f324c167827db854a98475a428346e65bbd6 /openbsd-compat/inet_ntoa.c
parentRemoval of advertising clause in accordance with: (diff)
downloadopenssh-329638e49c00639d6616b58cda234ba2b3059022.tar.xz
openssh-329638e49c00639d6616b58cda234ba2b3059022.zip
- (djm) Sync openbsd-compat with OpenBSD CVS.
- No more 4-term BSD licenses in our tree
Diffstat (limited to 'openbsd-compat/inet_ntoa.c')
-rw-r--r--openbsd-compat/inet_ntoa.c8
1 files changed, 2 insertions, 6 deletions
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 */
/*