mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 09:57:20 +00:00
Code Issues Releases Wiki Activity

[master] remove uses of vix.com, nominum.com and fugue.com

Browse Source 
Squashed commit of the following:

commit 375a26d52db75c3f62b8914f36e4f1618253075e
Author: Shawn Routhier <sar@isc.org>
Date:   Thu Aug 18 14:26:28 2016 -0700

    [rt43069] remove uses of vix.com, nominum.com and fugue.com
This commit is contained in:
Shawn Routhier 2016-08-23 21:38:45 -07:00
parent edd6d8881b
commit 60bba4343c
31 changed files with 49 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/dhclient.conf.5
View File

@ -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: configure the \fIfqdn\fR option on the client, as follows:
.PP .PP
.nf .nf
send fqdn.fqdn "grosse.fugue.com."; send fqdn.fqdn "grosse.example.com.";
send fqdn.encoded on; send fqdn.encoded on;
send fqdn.server-update off; send fqdn.server-update off;
also request fqdn, dhcp6.fqdn; 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. in a similar manner to the \fBhardware\fR statement.
.PP .PP
.SH SAMPLE .SH SAMPLE
The following configuration file is used on a laptop running NetBSD The following configuration file was used on a laptop running NetBSD
1.3. The laptop has an IP alias of 192.5.5.213, and has one 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 interface, ep0 (a 3com 3C589C). Booting intervals have been
shortened somewhat from the default, because the client is known to shortened somewhat from the default, because the client is known to
spend most of its time on networks with little DHCP activity. The spend most of its time on networks with little DHCP activity. The
@ -754,11 +755,11 @@ initial-interval 2;
reject 192.33.137.209; reject 192.33.137.209;
interface "ep0" { interface "ep0" {
send host-name "andare.fugue.com"; send host-name "andare.example.com";
hardware ethernet 00:a0:24:ab:fb:9c; hardware ethernet 00:a0:24:ab:fb:9c;
send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
send dhcp-lease-time 3600; 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; prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers, request subnet-mask, broadcast-address, time-offset, routers,
domain-name, domain-name-servers, host-name; domain-name, domain-name-servers, host-name;

4
client/dhclient.conf.example
View File

@ -1,7 +1,7 @@
send host-name = pick-first-value(gethostname(), "ISC-dhclient"); send host-name = pick-first-value(gethostname(), "ISC-dhclient");
send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
send dhcp-lease-time 3600; 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; prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers, request subnet-mask, broadcast-address, time-offset, routers,
domain-name, domain-name-servers, host-name; domain-name, domain-name-servers, host-name;
@ -25,7 +25,7 @@ lease {
interface "ep0"; interface "ep0";
fixed-address 192.33.137.200; fixed-address 192.33.137.200;
medium "link0 link1"; medium "link0 link1";
option host-name "andare.swiftmedia.com"; option host-name "andare.example.com";
option subnet-mask 255.255.255.0; option subnet-mask 255.255.255.0;
option broadcast-address 192.33.137.255; option broadcast-address 192.33.137.255;
option routers 192.33.137.250; option routers 192.33.137.250;

6
common/execute.c
View File

@ -583,14 +583,14 @@ void execute_statements_in_scope (result, packet,
scope, we are done. This is so that if somebody does something scope, we are done. This is so that if somebody does something
like this, it does the expected thing: like this, it does the expected thing:
domain-name "fugue.com"; domain-name "example.com";
shared-network FOO { shared-network FOO {
host bar { host bar {
domain-name "othello.fugue.com"; domain-name "othello.example.com";
fixed-address 10.20.30.40; fixed-address 10.20.30.40;
} }
subnet 10.20.30.0 netmask 255.255.255.0 { subnet 10.20.30.0 netmask 255.255.255.0 {
domain-name "manhattan.fugue.com"; domain-name "manhattan.example.com";
} }
} }

9
doc/ja_JP.eucJP/dhclient-script.8
View File

@ -1,6 +1,6 @@
.\" $Id: dhclient-script.8,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" $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 .\" Copyright (c) 1996-2003 by Internet Software Consortium
.\" .\"
.\" Permission to use, copy, modify, and distribute this software for any .\" Permission to use, copy, modify, and distribute this software for any
@ -21,13 +21,6 @@
.\" <info@isc.org> .\" <info@isc.org>
.\" https://www.isc.org/ .\" 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: 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 $ .\" $FreeBSD: doc/ja_JP.eucJP/man/man8/dhclient-script.8,v 1.13 2002/05/08 03:27:27 horikawa Exp $

15
doc/ja_JP.eucJP/dhclient.conf.5
View File

@ -1,6 +1,6 @@
.\" $Id: dhclient.conf.5,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" $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 .\" Copyright (c) 1996-2003 by Internet Software Consortium
.\" .\"
.\" Permission to use, copy, modify, and distribute this software for any .\" Permission to use, copy, modify, and distribute this software for any
@ -21,13 +21,6 @@
.\" <info@isc.org> .\" <info@isc.org>
.\" https://www.isc.org/ .\" 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: 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 $ .\" $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] .\" WORD: lease リース(アドレスの貸与)[dhclient.conf.5]
@ -237,7 +230,7 @@ DHCP
また、次のようにクライアントで fqdn オプションを設定する必要があります: また、次のようにクライアントで fqdn オプションを設定する必要があります:
.PP .PP
.nf .nf
send fqdn.fqdn "grosse.fugue.com."; send fqdn.fqdn "grosse.example.com.";
send fqdn.encoded on; send fqdn.encoded on;
send fqdn.server-update off; send fqdn.server-update off;
.fi .fi
@ -591,10 +584,10 @@ initial-interval 2;
reject 192.33.137.209; reject 192.33.137.209;
interface "ep0" { 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-client-identifier 1:0:a0:24:ab:fb:9c;
send dhcp-lease-time 3600; 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; prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers, request subnet-mask, broadcast-address, time-offset, routers,
domain-name, domain-name-servers, host-name; domain-name, domain-name-servers, host-name;

9
doc/ja_JP.eucJP/dhclient.leases.5
View File

@ -1,6 +1,6 @@
.\" $Id: dhclient.leases.5,v 1.4 2009/11/24 02:06:56 sar Exp $ .\" $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 .\" Copyright (c) 1997-2003 by Internet Software Consortium
.\" .\"
.\" Permission to use, copy, modify, and distribute this software for any .\" Permission to use, copy, modify, and distribute this software for any
@ -21,13 +21,6 @@
.\" <info@isc.org> .\" <info@isc.org>
.\" https://www.isc.org/ .\" 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: 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 $ .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhclient.leases.5,v 1.6 2002/05/05 20:40:23 horikawa Exp $

8
doc/ja_JP.eucJP/dhcp-eval.5
View File

@ -1,6 +1,6 @@
.\" $Id: dhcp-eval.5,v 1.5 2009/11/24 02:06:56 sar Exp $ .\" $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 .\" Copyright (c) 1996-2003 by Internet Software Consortium
.\" .\"
.\" Permission to use, copy, modify, and distribute this software for any .\" Permission to use, copy, modify, and distribute this software for any
@ -21,12 +21,6 @@
.\" <info@isc.org> .\" <info@isc.org>
.\" https://www.isc.org/ .\" 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 $ .\" $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 .TH dhcp-eval 5
.SH ̾¾Î .SH ̾¾Î

9
doc/ja_JP.eucJP/dhcp-options.5
View File

@ -1,6 +1,6 @@
.\" $Id: dhcp-options.5,v 1.5 2010/07/20 21:09:14 dhankins Exp $ .\" $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 .\" Copyright (c) 1996-2003 by Internet Software Consortium
.\" .\"
.\" Permission to use, copy, modify, and distribute this software for any .\" Permission to use, copy, modify, and distribute this software for any
@ -21,13 +21,6 @@
.\" <info@isc.org> .\" <info@isc.org>
.\" https://www.isc.org/ .\" 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: 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 $ .\" $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 動的ホスト構成プロトコル .\" WORD: Dynamic Host Configuration Protocol 動的ホスト構成プロトコル

8
includes/cf/aix.h
View File

@ -3,7 +3,7 @@
Configuration file for IBM's AIX operating system. */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 #define int8_t char

8
includes/cf/alphaosf.h
View File

@ -3,7 +3,7 @@
System dependencies for DEC Alpha/OSF1... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/bsdos.h
View File

@ -3,7 +3,7 @@
System dependencies for BSDI BSD/OS... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/cygwin32.h
View File

@ -4,7 +4,7 @@
doesn't work yet, so don't get too excited! */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -25,12 +25,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <sys/time.h> #include <sys/time.h>

8
includes/cf/freebsd.h
View File

@ -3,7 +3,7 @@
System dependencies for FreeBSD... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/hpux.h
View File

@ -3,7 +3,7 @@
Configuration file for HP-UX */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 #define int8_t char

8
includes/cf/linux.h
View File

@ -5,7 +5,7 @@
Based on a configuration originally supplied by Jonathan Stone. */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -26,12 +26,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <features.h> #include <features.h>

8
includes/cf/netbsd.h
View File

@ -3,7 +3,7 @@
System dependencies for NetBSD... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/nextstep.h
View File

@ -3,7 +3,7 @@
System dependencies for NEXTSTEP 3 & 4 (tested on 4.2PR2)... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 */ /* NeXT needs BSD44 ssize_t */

8
includes/cf/openbsd.h
View File

@ -3,7 +3,7 @@
System dependencies for OpenBSD... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/qnx.h
View File

@ -3,7 +3,7 @@
System dependencies for QNX... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <sys/types.h> #include <sys/types.h>

8
includes/cf/rhapsody.h
View File

@ -3,7 +3,7 @@
System dependencies for NetBSD... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/sample.h
View File

@ -9,7 +9,7 @@
probably worth looking at the config files for working ports as well. */ 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) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium * Copyright (c) 1996-2003 by Internet Software Consortium
* *
@ -31,12 +31,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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:: /* Porting::

8
includes/cf/sco.h
View File

@ -5,7 +5,7 @@
Based on changes contributed by Gerald Rosenberg. */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -26,12 +26,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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 <syslog.h> #include <syslog.h>

8
includes/cf/sunos4.h
View File

@ -3,7 +3,7 @@
System dependencies for SunOS 4 (tested on 4.1.4)... */ 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) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium * Copyright (c) 1996-2003 by Internet Software Consortium
* *
@ -25,12 +25,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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... */ /* Basic Integer Types not defined in SunOS headers... */

8
includes/cf/sunos5-5.h
View File

@ -3,7 +3,7 @@
System dependencies for Solaris 2.x (tested on 2.5 with gcc)... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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. */ /* SunOS defines uint*_t and int*_t, but not u_int*_t. */

8
includes/cf/ultrix.h
View File

@ -3,7 +3,7 @@
System dependencies for Ultrix 4.2 (tested on 4.2a+multicast)... */ 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 * Copyright (c) 1996-2003 by Internet Software Consortium
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -24,12 +24,6 @@
* <info@isc.org> * <info@isc.org>
* https://www.isc.org/ * 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(). */ /* Ultrix uses the old 4.2BSD-style syslog(). */

5
server/ddns.c
View File

@ -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) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2000-2003 by Internet Software Consortium * Copyright (c) 2000-2003 by Internet Software Consortium
* *
@ -30,8 +30,7 @@
* by Damien Neil of Nominum, Inc. * by Damien Neil of Nominum, Inc.
* *
* To learn more about Internet Systems Consortium, see * To learn more about Internet Systems Consortium, see
* ``https://www.isc.org/''. To learn more about Nominum, Inc., see * ``https://www.isc.org/''.
* ``http://www.nominum.com''.
*/ */
#include "dhcpd.h" #include "dhcpd.h"

2
server/dhcpd.8
View File

@ -491,7 +491,7 @@ use a different name server might be declared as follows:
fixed-address 239.252.197.9; fixed-address 239.252.197.9;
filename "/tftpboot/haagen.boot"; filename "/tftpboot/haagen.boot";
option domain-name-servers 192.5.5.1; option domain-name-servers 192.5.5.1;
option domain-name "vix.com"; option domain-name "example.com";
} }
.fi .fi
.PP .PP

8
server/dhcpd.conf.5
View File

@ -541,9 +541,9 @@ primary server might look like this:
.nf .nf
failover peer "foo" { failover peer "foo" {
primary; primary;
address anthrax.rc.vix.com; address anthrax.rc.example.com;
port 519; port 519;
peer address trantor.rc.vix.com; peer address trantor.rc.example.com;
peer port 520; peer port 520;
max-response-delay 60; max-response-delay 60;
max-unacked-updates 10; max-unacked-updates 10;
@ -3224,7 +3224,7 @@ hostname. So, for example,
host joe { host joe {
hardware ethernet 08:00:2b:4c:29:32; 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 { host joe {
hardware ethernet 08:00:2b:4c:29:32; hardware ethernet 08:00:2b:4c:29:32;
fixed-address joe.fugue.com; fixed-address joe.example.com;
option host-name "joe"; option host-name "joe";
} }
.fi .fi

4
server/dhcpd.conf.example
View File

@ -62,7 +62,7 @@ subnet 10.5.5.0 netmask 255.255.255.224 {
host passacaglia { host passacaglia {
hardware ethernet 0:0:c0:5d:bd:95; hardware ethernet 0:0:c0:5d:bd:95;
filename "vmunix.passacaglia"; filename "vmunix.passacaglia";
server-name "toccata.fugue.com"; server-name "toccata.example.com";
} }
# Fixed IP addresses can also be specified for hosts. These addresses # Fixed IP addresses can also be specified for hosts. These addresses
@ -74,7 +74,7 @@ host passacaglia {
# set. # set.
host fantasia { host fantasia {
hardware ethernet 08:00:07:26:c0:a5; 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 # You can declare a class of clients and then do address allocation

4
tests/failover/dhcp-1.cf
View File

@ -80,7 +80,7 @@ key FOO {
secret ABCD; secret ABCD;
} }
zone BISBEE.FUGUE.COM. { zone BISBEE.EXAMPLE.COM. {
primary 127.0.0.1; primary 127.0.0.1;
key FOO; 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; range 10.0.0.9 10.0.0.9;
} }
option routers 10.0.0.1; 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; option domain-name-servers 10.0.0.1;
} }

4
tests/failover/dhcp-2.cf
View File

@ -78,7 +78,7 @@ key FOO {
secret ABCD; secret ABCD;
} }
zone BISBEE.FUGUE.COM. { zone BISBEE.EXAMPLE.COM. {
primary 127.0.0.1; primary 127.0.0.1;
key FOO; 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; range 10.0.0.9 10.0.0.9;
} }
option routers 10.0.0.1; 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; option domain-name-servers 10.0.0.1;
} }