Module Name: src
Committed By: christos
Date: Tue Feb 24 17:56:20 UTC 2015
Modified Files:
src/lib/libc/resolv: herror.c res_comp.c res_debug.c res_init.c
res_mkquery.c res_query.c res_send.c
Log Message:
belated removal of the advertising clause.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/resolv/herror.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/resolv/res_comp.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/resolv/res_debug.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/resolv/res_init.c \
src/lib/libc/resolv/res_send.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/resolv/res_mkquery.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/resolv/res_query.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/resolv/herror.c
diff -u src/lib/libc/resolv/herror.c:1.9 src/lib/libc/resolv/herror.c:1.10
--- src/lib/libc/resolv/herror.c:1.9 Tue Mar 13 17:13:43 2012
+++ src/lib/libc/resolv/herror.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: herror.c,v 1.9 2012/03/13 21:13:43 christos Exp $ */
+/* $NetBSD: herror.c,v 1.10 2015/02/24 17:56:20 christos Exp $ */
/*
* Copyright (c) 1987, 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.
*
@@ -56,7 +52,7 @@
static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp";
#else
-__RCSID("$NetBSD: herror.c,v 1.9 2012/03/13 21:13:43 christos Exp $");
+__RCSID("$NetBSD: herror.c,v 1.10 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/resolv/res_comp.c
diff -u src/lib/libc/resolv/res_comp.c:1.12 src/lib/libc/resolv/res_comp.c:1.13
--- src/lib/libc/resolv/res_comp.c:1.12 Tue Mar 13 17:13:43 2012
+++ src/lib/libc/resolv/res_comp.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: res_comp.c,v 1.12 2012/03/13 21:13:43 christos Exp $ */
+/* $NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $ */
/*
* Copyright (c) 1985, 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.
*
@@ -75,7 +71,7 @@
static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp";
#else
-__RCSID("$NetBSD: res_comp.c,v 1.12 2012/03/13 21:13:43 christos Exp $");
+__RCSID("$NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/resolv/res_debug.c
diff -u src/lib/libc/resolv/res_debug.c:1.13 src/lib/libc/resolv/res_debug.c:1.14
--- src/lib/libc/resolv/res_debug.c:1.13 Mon Jun 25 18:32:45 2012
+++ src/lib/libc/resolv/res_debug.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: res_debug.c,v 1.13 2012/06/25 22:32:45 abs Exp $ */
+/* $NetBSD: res_debug.c,v 1.14 2015/02/24 17:56:20 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -29,11 +29,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.
*
@@ -101,7 +97,7 @@
static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp";
#else
-__RCSID("$NetBSD: res_debug.c,v 1.13 2012/06/25 22:32:45 abs Exp $");
+__RCSID("$NetBSD: res_debug.c,v 1.14 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/resolv/res_init.c
diff -u src/lib/libc/resolv/res_init.c:1.29 src/lib/libc/resolv/res_init.c:1.30
--- src/lib/libc/resolv/res_init.c:1.29 Mon Sep 15 21:29:48 2014
+++ src/lib/libc/resolv/res_init.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: res_init.c,v 1.29 2014/09/16 01:29:48 christos Exp $ */
+/* $NetBSD: res_init.c,v 1.30 2015/02/24 17:56:20 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 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.
*
@@ -76,7 +72,7 @@
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp";
#else
-__RCSID("$NetBSD: res_init.c,v 1.29 2014/09/16 01:29:48 christos Exp $");
+__RCSID("$NetBSD: res_init.c,v 1.30 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/resolv/res_send.c
diff -u src/lib/libc/resolv/res_send.c:1.29 src/lib/libc/resolv/res_send.c:1.30
--- src/lib/libc/resolv/res_send.c:1.29 Sat Feb 16 08:45:45 2013
+++ src/lib/libc/resolv/res_send.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: res_send.c,v 1.29 2013/02/16 13:45:45 para Exp $ */
+/* $NetBSD: res_send.c,v 1.30 2015/02/24 17:56:20 christos Exp $ */
/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
@@ -29,11 +29,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.
*
@@ -93,7 +89,7 @@
static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp";
#else
-__RCSID("$NetBSD: res_send.c,v 1.29 2013/02/16 13:45:45 para Exp $");
+__RCSID("$NetBSD: res_send.c,v 1.30 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/resolv/res_mkquery.c
diff -u src/lib/libc/resolv/res_mkquery.c:1.14 src/lib/libc/resolv/res_mkquery.c:1.15
--- src/lib/libc/resolv/res_mkquery.c:1.14 Mon Nov 10 22:29:24 2014
+++ src/lib/libc/resolv/res_mkquery.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: res_mkquery.c,v 1.14 2014/11/11 03:29:24 christos Exp $ */
+/* $NetBSD: res_mkquery.c,v 1.15 2015/02/24 17:56:20 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC")
@@ -29,11 +29,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.
*
@@ -76,7 +72,7 @@
static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp";
#else
-__RCSID("$NetBSD: res_mkquery.c,v 1.14 2014/11/11 03:29:24 christos Exp $");
+__RCSID("$NetBSD: res_mkquery.c,v 1.15 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/resolv/res_query.c
diff -u src/lib/libc/resolv/res_query.c:1.15 src/lib/libc/resolv/res_query.c:1.16
--- src/lib/libc/resolv/res_query.c:1.15 Mon Sep 15 21:30:00 2014
+++ src/lib/libc/resolv/res_query.c Tue Feb 24 12:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: res_query.c,v 1.15 2014/09/16 01:30:00 christos Exp $ */
+/* $NetBSD: res_query.c,v 1.16 2015/02/24 17:56:20 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC")
@@ -29,11 +29,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.
*
@@ -93,7 +89,7 @@
static const char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp";
#else
-__RCSID("$NetBSD: res_query.c,v 1.15 2014/09/16 01:30:00 christos Exp $");
+__RCSID("$NetBSD: res_query.c,v 1.16 2015/02/24 17:56:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
