From: Shawn Routhier Date: Wed, 24 Aug 2016 04:38:45 +0000 (-0700) Subject: [master] remove uses of vix.com, nominum.com and fugue.com X-Git-Tag: v4_4_0b1_f1~143 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60bba4343c0166736b2c94a867004825b6fd4244;p=thirdparty%2Fdhcp.git [master] remove uses of vix.com, nominum.com and fugue.com Squashed commit of the following: commit 375a26d52db75c3f62b8914f36e4f1618253075e Author: Shawn Routhier Date: Thu Aug 18 14:26:28 2016 -0700 [rt43069] remove uses of vix.com, nominum.com and fugue.com --- diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5 index 382837c0b..d0ff11454 100644 --- a/client/dhclient.conf.5 +++ b/client/dhclient.conf.5 @@ -296,7 +296,7 @@ server (see \fBdhcpd.conf\fR(5) for details). You also need to configure the \fIfqdn\fR option on the client, as follows: .PP .nf - send fqdn.fqdn "grosse.fugue.com."; + send fqdn.fqdn "grosse.example.com."; send fqdn.encoded on; send fqdn.server-update off; also request fqdn, dhcp6.fqdn; @@ -737,8 +737,9 @@ client. The \fIlink-type\fR and \fImac-address\fR parameters are configured in a similar manner to the \fBhardware\fR statement. .PP .SH SAMPLE -The following configuration file is used on a laptop running NetBSD -1.3. The laptop has an IP alias of 192.5.5.213, and has one +The following configuration file was used on a laptop running NetBSD +1.3, though the domains have been modified. +The laptop has an IP alias of 192.5.5.213, and has one interface, ep0 (a 3com 3C589C). Booting intervals have been shortened somewhat from the default, because the client is known to spend most of its time on networks with little DHCP activity. The @@ -754,11 +755,11 @@ initial-interval 2; reject 192.33.137.209; interface "ep0" { - send host-name "andare.fugue.com"; + send host-name "andare.example.com"; hardware ethernet 00:a0:24:ab:fb:9c; send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; send dhcp-lease-time 3600; - supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com"; + supersede domain-search "example.com", "rc.isc.org", "home.isc.org"; prepend domain-name-servers 127.0.0.1; request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name; diff --git a/client/dhclient.conf.example b/client/dhclient.conf.example index b8354de80..2c35d2485 100644 --- a/client/dhclient.conf.example +++ b/client/dhclient.conf.example @@ -1,7 +1,7 @@ send host-name = pick-first-value(gethostname(), "ISC-dhclient"); send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; send dhcp-lease-time 3600; -supersede domain-search "fugue.com", "home.vix.com"; +supersede domain-search "example.com", "isc.org"; prepend domain-name-servers 127.0.0.1; request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name; @@ -25,7 +25,7 @@ lease { interface "ep0"; fixed-address 192.33.137.200; medium "link0 link1"; - option host-name "andare.swiftmedia.com"; + option host-name "andare.example.com"; option subnet-mask 255.255.255.0; option broadcast-address 192.33.137.255; option routers 192.33.137.250; diff --git a/common/execute.c b/common/execute.c index ba393d3b2..fa4e0f8d4 100644 --- a/common/execute.c +++ b/common/execute.c @@ -583,14 +583,14 @@ void execute_statements_in_scope (result, packet, scope, we are done. This is so that if somebody does something like this, it does the expected thing: - domain-name "fugue.com"; + domain-name "example.com"; shared-network FOO { host bar { - domain-name "othello.fugue.com"; + domain-name "othello.example.com"; fixed-address 10.20.30.40; } subnet 10.20.30.0 netmask 255.255.255.0 { - domain-name "manhattan.fugue.com"; + domain-name "manhattan.example.com"; } } diff --git a/doc/ja_JP.eucJP/dhclient-script.8 b/doc/ja_JP.eucJP/dhclient-script.8 index 01388a299..9ebcf3f0f 100644 --- a/doc/ja_JP.eucJP/dhclient-script.8 +++ b/doc/ja_JP.eucJP/dhclient-script.8 @@ -1,6 +1,6 @@ .\" $Id: dhclient-script.8,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. -.\" .\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.5.2.4 2002/04/11 10:16:45 murray Exp % .\" .\" $FreeBSD: doc/ja_JP.eucJP/man/man8/dhclient-script.8,v 1.13 2002/05/08 03:27:27 horikawa Exp $ diff --git a/doc/ja_JP.eucJP/dhclient.conf.5 b/doc/ja_JP.eucJP/dhclient.conf.5 index 187538bd7..a14e1da6b 100644 --- a/doc/ja_JP.eucJP/dhclient.conf.5 +++ b/doc/ja_JP.eucJP/dhclient.conf.5 @@ -1,6 +1,6 @@ .\" $Id: dhclient.conf.5,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. -.\" .\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient.conf.5,v 1.7.2.1 2002/04/11 10:16:46 murray Exp % .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhclient.conf.5,v 1.6 2002/05/03 03:23:30 horikawa Exp $ .\" WORD: lease ¥ê¡¼¥¹(¥¢¥É¥ì¥¹¤ÎÂßÍ¿)[dhclient.conf.5] @@ -237,7 +230,7 @@ DHCP ¤Þ¤¿¡¢¼¡¤Î¤è¤¦¤Ë¥¯¥é¥¤¥¢¥ó¥È¤Ç fqdn ¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹: .PP .nf - send fqdn.fqdn "grosse.fugue.com."; + send fqdn.fqdn "grosse.example.com."; send fqdn.encoded on; send fqdn.server-update off; .fi @@ -591,10 +584,10 @@ initial-interval 2; reject 192.33.137.209; interface "ep0" { - send host-name "andare.fugue.com"; + send host-name "andare.example.com"; send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; send dhcp-lease-time 3600; - supersede domain-name "fugue.com rc.vix.com home.vix.com"; + supersede domain-name "example.com rc.isc.org home.isc.org"; prepend domain-name-servers 127.0.0.1; request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name; diff --git a/doc/ja_JP.eucJP/dhclient.leases.5 b/doc/ja_JP.eucJP/dhclient.leases.5 index 5a34516b1..d88a9d94a 100644 --- a/doc/ja_JP.eucJP/dhclient.leases.5 +++ b/doc/ja_JP.eucJP/dhclient.leases.5 @@ -1,6 +1,6 @@ .\" $Id: dhclient.leases.5,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1997-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie -.\" Enterprises. To learn more about Internet Systems Consortium, -.\" see ``https://www.isc.org/''. To learn more about Vixie -.\" Enterprises, see ``http://www.vix.com''. -.\" -.\" .\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient.leases.5,v 1.2.4.1 2002/04/11 10:16:46 murray Exp % .\" .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhclient.leases.5,v 1.6 2002/05/05 20:40:23 horikawa Exp $ diff --git a/doc/ja_JP.eucJP/dhcp-eval.5 b/doc/ja_JP.eucJP/dhcp-eval.5 index 0d3bc2c7e..5ec229513 100644 --- a/doc/ja_JP.eucJP/dhcp-eval.5 +++ b/doc/ja_JP.eucJP/dhcp-eval.5 @@ -1,6 +1,6 @@ .\" $Id: dhcp-eval.5,v 1.5 2009/11/24 02:06:56 sar Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,12 +21,6 @@ .\" .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhcp-eval.5,v 1.2 2002/05/23 04:17:13 horikawa Exp $ .TH dhcp-eval 5 .SH ̾¾Î diff --git a/doc/ja_JP.eucJP/dhcp-options.5 b/doc/ja_JP.eucJP/dhcp-options.5 index f13ceb4ae..5dcaa2d95 100644 --- a/doc/ja_JP.eucJP/dhcp-options.5 +++ b/doc/ja_JP.eucJP/dhcp-options.5 @@ -1,6 +1,6 @@ .\" $Id: dhcp-options.5,v 1.5 2010/07/20 21:09:14 dhankins Exp $ .\" -.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -21,13 +21,6 @@ .\" .\" https://www.isc.org/ .\" -.\" This software has been written for Internet Systems Consortium -.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about Internet Systems Consortium, see -.\" ``https://www.isc.org/''. To learn more about Vixie Enterprises, -.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see -.\" ``http://www.nominum.com''. -.\" .\" %FreeBSD: src/contrib/isc-dhcp/common/dhcp-options.5,v 1.2.2.1 2002/04/11 10:16:46 murray Exp % .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhcp-options.5,v 1.11 2002/05/21 03:51:52 horikawa Exp $ .\" WORD: Dynamic Host Configuration Protocol ưŪ¥Û¥¹¥È¹½À®¥×¥í¥È¥³¥ë diff --git a/includes/cf/aix.h b/includes/cf/aix.h index e61853775..0a2a0a1fd 100644 --- a/includes/cf/aix.h +++ b/includes/cf/aix.h @@ -3,7 +3,7 @@ Configuration file for IBM's AIX operating system. */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #define int8_t char diff --git a/includes/cf/alphaosf.h b/includes/cf/alphaosf.h index eda46fc15..dba9a3e8c 100644 --- a/includes/cf/alphaosf.h +++ b/includes/cf/alphaosf.h @@ -3,7 +3,7 @@ System dependencies for DEC Alpha/OSF1... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/bsdos.h b/includes/cf/bsdos.h index 05d74ec67..80f94e4f7 100644 --- a/includes/cf/bsdos.h +++ b/includes/cf/bsdos.h @@ -3,7 +3,7 @@ System dependencies for BSDI BSD/OS... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/cygwin32.h b/includes/cf/cygwin32.h index c315f1262..b3b5770f0 100644 --- a/includes/cf/cygwin32.h +++ b/includes/cf/cygwin32.h @@ -4,7 +4,7 @@ doesn't work yet, so don't get too excited! */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -25,12 +25,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/freebsd.h b/includes/cf/freebsd.h index 1c3cfb67a..d840d9638 100644 --- a/includes/cf/freebsd.h +++ b/includes/cf/freebsd.h @@ -3,7 +3,7 @@ System dependencies for FreeBSD... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/hpux.h b/includes/cf/hpux.h index ae86db873..93b88f26f 100644 --- a/includes/cf/hpux.h +++ b/includes/cf/hpux.h @@ -3,7 +3,7 @@ Configuration file for HP-UX */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #define int8_t char diff --git a/includes/cf/linux.h b/includes/cf/linux.h index 6995451f1..fe7c821a3 100644 --- a/includes/cf/linux.h +++ b/includes/cf/linux.h @@ -5,7 +5,7 @@ Based on a configuration originally supplied by Jonathan Stone. */ /* - * Copyright (c) 2004,2005,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2005,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -26,12 +26,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/netbsd.h b/includes/cf/netbsd.h index 396f1e9c4..3291a4edd 100644 --- a/includes/cf/netbsd.h +++ b/includes/cf/netbsd.h @@ -3,7 +3,7 @@ System dependencies for NetBSD... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/nextstep.h b/includes/cf/nextstep.h index e61ca741a..63f673353 100644 --- a/includes/cf/nextstep.h +++ b/includes/cf/nextstep.h @@ -3,7 +3,7 @@ System dependencies for NEXTSTEP 3 & 4 (tested on 4.2PR2)... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ /* NeXT needs BSD44 ssize_t */ diff --git a/includes/cf/openbsd.h b/includes/cf/openbsd.h index ab767efed..4569f83fe 100644 --- a/includes/cf/openbsd.h +++ b/includes/cf/openbsd.h @@ -3,7 +3,7 @@ System dependencies for OpenBSD... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/qnx.h b/includes/cf/qnx.h index f3a14a134..8f6bd5cd9 100644 --- a/includes/cf/qnx.h +++ b/includes/cf/qnx.h @@ -3,7 +3,7 @@ System dependencies for QNX... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/rhapsody.h b/includes/cf/rhapsody.h index a32040f4e..9d4744b1a 100644 --- a/includes/cf/rhapsody.h +++ b/includes/cf/rhapsody.h @@ -3,7 +3,7 @@ System dependencies for NetBSD... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/sample.h b/includes/cf/sample.h index bf3a2c665..1b243c2da 100644 --- a/includes/cf/sample.h +++ b/includes/cf/sample.h @@ -9,7 +9,7 @@ probably worth looking at the config files for working ports as well. */ /* - * Copyright (c) 2011 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2011,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * @@ -31,12 +31,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ /* Porting:: diff --git a/includes/cf/sco.h b/includes/cf/sco.h index 62d4e26b9..c59f4f4db 100644 --- a/includes/cf/sco.h +++ b/includes/cf/sco.h @@ -5,7 +5,7 @@ Based on changes contributed by Gerald Rosenberg. */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -26,12 +26,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ #include diff --git a/includes/cf/sunos4.h b/includes/cf/sunos4.h index 6c17c74b1..189a816c7 100644 --- a/includes/cf/sunos4.h +++ b/includes/cf/sunos4.h @@ -3,7 +3,7 @@ System dependencies for SunOS 4 (tested on 4.1.4)... */ /* - * Copyright (c) 2011 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2011,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * @@ -25,12 +25,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ /* Basic Integer Types not defined in SunOS headers... */ diff --git a/includes/cf/sunos5-5.h b/includes/cf/sunos5-5.h index e925113f9..16befe2e4 100644 --- a/includes/cf/sunos5-5.h +++ b/includes/cf/sunos5-5.h @@ -3,7 +3,7 @@ System dependencies for Solaris 2.x (tested on 2.5 with gcc)... */ /* - * Copyright (c) 2004,2005,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2005,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ /* SunOS defines uint*_t and int*_t, but not u_int*_t. */ diff --git a/includes/cf/ultrix.h b/includes/cf/ultrix.h index 5eefbd132..500ce6b3b 100644 --- a/includes/cf/ultrix.h +++ b/includes/cf/ultrix.h @@ -3,7 +3,7 @@ System dependencies for Ultrix 4.2 (tested on 4.2a+multicast)... */ /* - * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004,2007,2009,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -24,12 +24,6 @@ * * https://www.isc.org/ * - * This software has been written for Internet Systems Consortium - * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Vixie Enterprises, - * see ``http://www.vix.com''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. */ /* Ultrix uses the old 4.2BSD-style syslog(). */ diff --git a/server/ddns.c b/server/ddns.c index d6d53bf47..c5fdd3f25 100644 --- a/server/ddns.c +++ b/server/ddns.c @@ -4,7 +4,7 @@ /* * - * Copyright (c) 2009-2015 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2009-2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2000-2003 by Internet Software Consortium * @@ -30,8 +30,7 @@ * by Damien Neil of Nominum, Inc. * * To learn more about Internet Systems Consortium, see - * ``https://www.isc.org/''. To learn more about Nominum, Inc., see - * ``http://www.nominum.com''. + * ``https://www.isc.org/''. */ #include "dhcpd.h" diff --git a/server/dhcpd.8 b/server/dhcpd.8 index c5a0a32a6..6ca794023 100644 --- a/server/dhcpd.8 +++ b/server/dhcpd.8 @@ -491,7 +491,7 @@ use a different name server might be declared as follows: fixed-address 239.252.197.9; filename "/tftpboot/haagen.boot"; option domain-name-servers 192.5.5.1; - option domain-name "vix.com"; + option domain-name "example.com"; } .fi .PP diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 index 4090debef..975318354 100644 --- a/server/dhcpd.conf.5 +++ b/server/dhcpd.conf.5 @@ -541,9 +541,9 @@ primary server might look like this: .nf failover peer "foo" { primary; - address anthrax.rc.vix.com; + address anthrax.rc.example.com; port 519; - peer address trantor.rc.vix.com; + peer address trantor.rc.example.com; peer port 520; max-response-delay 60; max-unacked-updates 10; @@ -3224,7 +3224,7 @@ hostname. So, for example, host joe { hardware ethernet 08:00:2b:4c:29:32; - fixed-address joe.fugue.com; + fixed-address joe.example.com; } } @@ -3232,7 +3232,7 @@ is equivalent to host joe { hardware ethernet 08:00:2b:4c:29:32; - fixed-address joe.fugue.com; + fixed-address joe.example.com; option host-name "joe"; } .fi diff --git a/server/dhcpd.conf.example b/server/dhcpd.conf.example index 5eab9516d..8b99f4965 100644 --- a/server/dhcpd.conf.example +++ b/server/dhcpd.conf.example @@ -62,7 +62,7 @@ subnet 10.5.5.0 netmask 255.255.255.224 { host passacaglia { hardware ethernet 0:0:c0:5d:bd:95; filename "vmunix.passacaglia"; - server-name "toccata.fugue.com"; + server-name "toccata.example.com"; } # Fixed IP addresses can also be specified for hosts. These addresses @@ -74,7 +74,7 @@ host passacaglia { # set. host fantasia { hardware ethernet 08:00:07:26:c0:a5; - fixed-address fantasia.fugue.com; + fixed-address fantasia.example.com; } # You can declare a class of clients and then do address allocation diff --git a/tests/failover/dhcp-1.cf b/tests/failover/dhcp-1.cf index 07842ab0e..f72b46440 100644 --- a/tests/failover/dhcp-1.cf +++ b/tests/failover/dhcp-1.cf @@ -80,7 +80,7 @@ key FOO { secret ABCD; } -zone BISBEE.FUGUE.COM. { +zone BISBEE.EXAMPLE.COM. { primary 127.0.0.1; key FOO; } @@ -149,6 +149,6 @@ subnet 10.0.0.0 netmask 255.255.255.0 { range 10.0.0.9 10.0.0.9; } option routers 10.0.0.1; - option domain-name "bisbee.fugue.com"; + option domain-name "bisbee.example.com"; option domain-name-servers 10.0.0.1; } diff --git a/tests/failover/dhcp-2.cf b/tests/failover/dhcp-2.cf index c9dfabe8f..664195170 100644 --- a/tests/failover/dhcp-2.cf +++ b/tests/failover/dhcp-2.cf @@ -78,7 +78,7 @@ key FOO { secret ABCD; } -zone BISBEE.FUGUE.COM. { +zone BISBEE.EXAMPLE.COM. { primary 127.0.0.1; key FOO; } @@ -147,6 +147,6 @@ subnet 10.0.0.0 netmask 255.255.255.0 { range 10.0.0.9 10.0.0.9; } option routers 10.0.0.1; - option domain-name "bisbee.fugue.com"; + option domain-name "bisbee.example.com"; option domain-name-servers 10.0.0.1; }