eb72a55a2b
domain-search', which is what was actually demonstrated (#467955)
643 lines
23 KiB
Diff
643 lines
23 KiB
Diff
diff -up dhcp-4.0.0/client/dhclient-script.8.manpages dhcp-4.0.0/client/dhclient-script.8
|
|
--- dhcp-4.0.0/client/dhclient-script.8.manpages 2006-02-24 13:16:27.000000000 -1000
|
|
+++ dhcp-4.0.0/client/dhclient-script.8 2008-10-23 09:58:40.000000000 -1000
|
|
@@ -47,16 +47,16 @@ customizations are needed, they should b
|
|
exit hooks provided (see HOOKS for details). These hooks will allow the
|
|
user to override the default behaviour of the client in creating a
|
|
.B /etc/resolv.conf
|
|
-file.
|
|
+file, and to handle DHCP options not handled by default.
|
|
.PP
|
|
No standard client script exists for some operating systems, even though
|
|
the actual client may work, so a pioneering user may well need to create
|
|
a new script or modify an existing one. In general, customizations specific
|
|
to a particular computer should be done in the
|
|
-.B ETCDIR/dhclient.conf
|
|
+.B /usr/local/etc/dhclient.conf
|
|
file. If you find that you can't make such a customization without
|
|
customizing
|
|
-.B ETCDIR/dhclient.conf
|
|
+.B /usr/local/etc/dhclient.conf
|
|
or using the enter and exit hooks, please submit a bug report.
|
|
.SH HOOKS
|
|
When it starts, the client script first defines a shell function,
|
|
@@ -68,33 +68,53 @@ the enter hook script.
|
|
.PP
|
|
On after defining the make_resolv_conf function, the client script checks
|
|
for the presence of an executable
|
|
-.B ETCDIR/dhclient-enter-hooks
|
|
+.B /usr/local/etc/dhclient-enter-hooks
|
|
script, and if present, it invokes the script inline, using the Bourne
|
|
shell '.' command. The entire environment documented under OPERATION
|
|
is available to this script, which may modify the environment if needed
|
|
to change the behaviour of the script. If an error occurs during the
|
|
execution of the script, it can set the exit_status variable to a nonzero
|
|
value, and
|
|
-.B CLIENTBINDIR/dhclient-script
|
|
+.B /sbin/dhclient-script
|
|
will exit with that error code immediately after the client script exits.
|
|
.PP
|
|
After all processing has completed,
|
|
-.B CLIENTBINDIR/dhclient-script
|
|
+.B /sbin/dhclient-script
|
|
checks for the presence of an executable
|
|
-.B ETCDIR/dhclient-exit-hooks
|
|
+.B /usr/local/etc/dhclient-exit-hooks
|
|
script, which if present is invoked using the '.' command. The exit
|
|
status of dhclient-script will be passed to dhclient-exit-hooks in the
|
|
exit_status shell variable, and will always be zero if the script
|
|
succeeded at the task for which it was invoked. The rest of the
|
|
environment as described previously for dhclient-enter-hooks is also
|
|
present. The
|
|
-.B ETCDIR/dhclient-exit-hooks
|
|
+.B /usr/local/etc/dhclient-exit-hooks
|
|
script can modify the valid of exit_status to change the exit status
|
|
of dhclient-script.
|
|
+.PP
|
|
+Immediately after dhclient brings an interface UP with a new IP address,
|
|
+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
|
|
+existence of an executable
|
|
+.B /usr/local/etc/dhclient-up-hooks
|
|
+script, and source it if found. This script can handle DHCP options in
|
|
+the environment that are not handled by default. A per-interface.
|
|
+.B /usr/local/etc/dhclient-${IF}-up-hooks
|
|
+script will override the generic script and be sourced when interface
|
|
+$IF has been brought up.
|
|
+.PP
|
|
+Immediately before dhclient brings an interface DOWN, removing its IP
|
|
+address, subnet mask, and routes, in the STOP/RELEASE states, it will
|
|
+check for the existence of an executable
|
|
+.B /usr/local/etc/dhclient-down-hooks
|
|
+script, and source it if found. This script can handle DHCP options in
|
|
+the environment that are not handled by default. A per-interface
|
|
+.B /usr/local/etc/dhclient-${IF}-down-hooks
|
|
+script will override the generic script and be sourced when interface
|
|
+$IF is about to be brought down.
|
|
.SH OPERATION
|
|
When dhclient needs to invoke the client configuration script, it
|
|
defines a set of variables in the environment, and then invokes
|
|
-.B CLIENTBINDIR/dhclient-script.
|
|
+.B /sbin/dhclient-script.
|
|
In all cases, $reason is set to the name of the reason why the script
|
|
has been invoked. The following reasons are currently defined:
|
|
MEDIUM, PREINIT, BOUND, RENEW, REBIND, REBOOT, EXPIRE, FAIL, STOP, RELEASE,
|
|
diff -up dhcp-4.0.0/client/dhclient.8.manpages dhcp-4.0.0/client/dhclient.8
|
|
--- dhcp-4.0.0/client/dhclient.8.manpages 2007-10-04 07:13:25.000000000 -1000
|
|
+++ dhcp-4.0.0/client/dhclient.8 2008-10-23 09:58:40.000000000 -1000
|
|
@@ -91,6 +91,33 @@ relay
|
|
.B -w
|
|
]
|
|
[
|
|
+.B -B
|
|
+]
|
|
+[
|
|
+.B -I
|
|
+.I dhcp-client-identifier
|
|
+]
|
|
+[
|
|
+.B -H
|
|
+.I host-name
|
|
+]
|
|
+[
|
|
+.B -F
|
|
+.I fqdn.fqdn
|
|
+]
|
|
+[
|
|
+.B -V
|
|
+.I vendor-class-identifier
|
|
+]
|
|
+[
|
|
+.B -R
|
|
+.I request-option-list
|
|
+]
|
|
+[
|
|
+.B -T
|
|
+.I timeout
|
|
+]
|
|
+[
|
|
.B -v
|
|
]
|
|
[
|
|
@@ -118,16 +145,6 @@ important details about the network to w
|
|
the location of a default router, the location of a name server, and
|
|
so on.
|
|
.PP
|
|
-If given the -4 command line argument (default), dhclient will use the
|
|
-DHCPv4 protocol to obtain an IPv4 address and configuration parameters.
|
|
-.PP
|
|
-If given the -6 command line argument, dhclient will use the DHCPv6
|
|
-protocol to obtain whatever IPv6 addresses are available along with
|
|
-configuration parameters. Information-request is not yet supported.
|
|
-.PP
|
|
-If given the --version command line argument, dhclient will print its
|
|
-version number and exit.
|
|
-.PP
|
|
On startup, dhclient reads the
|
|
.IR dhclient.conf
|
|
for configuration instructions. It then gets a list of all the
|
|
@@ -181,67 +198,183 @@ file. If interfaces are specified in t
|
|
only configure interfaces that are either specified in the
|
|
configuration file or on the command line, and will ignore all other
|
|
interfaces.
|
|
-.PP
|
|
-If the DHCP client should listen and transmit on a port other than the
|
|
-standard (port 68), the
|
|
-.B -p
|
|
-flag may used. It should be followed by the udp port number that
|
|
-dhclient should use. This is mostly useful for debugging purposes.
|
|
-If a different port is specified for the client to listen on and
|
|
-transmit on, the client will also use a different destination port -
|
|
-one greater than the specified destination port.
|
|
-.PP
|
|
-The DHCP client normally transmits any protocol messages it sends
|
|
-before acquiring an IP address to, 255.255.255.255, the IP limited
|
|
-broadcast address. For debugging purposes, it may be useful to have
|
|
-the server transmit these messages to some other address. This can
|
|
-be specified with the
|
|
-.B -s
|
|
-flag, followed by the IP address or domain name of the destination.
|
|
-.PP
|
|
-For testing purposes, the giaddr field of all packets that the client
|
|
-sends can be set using the
|
|
-.B -g
|
|
-flag, followed by the IP address to send. This is only useful for testing,
|
|
-and should not be expected to work in any consistent or useful way.
|
|
-.PP
|
|
-The DHCP client will normally run in the foreground until it has
|
|
-configured an interface, and then will revert to running in the
|
|
-background. To run force dhclient to always run as a foreground
|
|
-process, the
|
|
-.B -d
|
|
-flag should be specified. This is useful when running the client
|
|
-under a debugger, or when running it out of inittab on System V
|
|
-systems.
|
|
-.PP
|
|
-The dhclient daemon creates its own environment when executing the
|
|
-dhclient-script to do the grunt work of interface configuration.
|
|
-To define extra environment variables and their values, use the
|
|
-.B -e
|
|
-flag, followed by the environment variable name and value assignment,
|
|
-just as one would assign a variable in a shell. Eg:
|
|
-.B -e
|
|
-.I IF_METRIC=1
|
|
-.PP
|
|
-The client normally prints no output during its startup sequence. It
|
|
-can be made to emit verbose messages displaying the startup sequence events
|
|
-until it has acquired an address by supplying the
|
|
-.B -v
|
|
-command line argument. In either case, the client logs messages using
|
|
-the
|
|
-.B syslog (3)
|
|
-facility. A
|
|
-.B -q
|
|
-command line argument is provided for backwards compatibility, but since
|
|
-dhclient is quiet by default, it has no effect.
|
|
-.PP
|
|
-The client normally doesn't release the current lease as it is not
|
|
-required by the DHCP protocol. Some cable ISPs require their clients
|
|
-to notify the server if they wish to release an assigned IP address.
|
|
+.SH OPTIONS
|
|
+.TP
|
|
+.BI \-4
|
|
+Use the DHCPv4 protocol to obtain an IPv4 address and configuration
|
|
+parameters.
|
|
+
|
|
+.TP
|
|
+.BI \-6
|
|
+Use the DHCPv6 protocol to obtain whatever IPv6 addresses are available
|
|
+along with configuration parameters. Information-request is not yet
|
|
+supported.
|
|
+
|
|
+.TP
|
|
+.BI \-p\ <port\ number>
|
|
+The UDP port number the DHCP client should listen and transmit on. If
|
|
+unspecified,
|
|
+.B dhclient
|
|
+uses the default port 68. This option is mostly useful for debugging
|
|
+purposes. If a different port is specified for the client to listen and
|
|
+transmit on, the client will also use a different destination port - one
|
|
+greater than the specified destination port.
|
|
+
|
|
+.TP
|
|
+.BI \-d
|
|
+Force
|
|
+.B dhclient
|
|
+to run as a foreground process. This is useful when running the client
|
|
+under a debugger, or when running it out of inittab on System V systems.
|
|
+
|
|
+.TP
|
|
+.BI \-e\ VAR=value
|
|
+Define additional environment variables for the environment where
|
|
+dhclient-script executes. You may specify multiple
|
|
+.B \-e
|
|
+options on the command line.
|
|
+
|
|
+.TP
|
|
+.BI \-q
|
|
+Suppress all terminal and log output except error messages.
|
|
+
|
|
+.TP
|
|
+.BI \-1
|
|
+Try one to get a lease. On failure, exit with code 2.
|
|
+
|
|
+.TP
|
|
+.BI \-r
|
|
+Tell
|
|
+.B dhclient
|
|
+to release the current lease it has from the server. This is not required
|
|
+by the DHCP protocol, but some ISPs require their clients to notify the
|
|
+server if they wish to release an assigned IP address.
|
|
+
|
|
+.TP
|
|
+.BI \-lf\ <lease-file>
|
|
+Path to the lease database file. If unspecified, the default
|
|
+.B /private/var/db/dhclient/dhclient.leases
|
|
+is used.
|
|
+
|
|
+.TP
|
|
+.BI \-pf\ <pid-file>
|
|
+Path to the process ID file. If unspecified, the default
|
|
+.B /private/var/run/dhclient.pid
|
|
+is used.
|
|
+
|
|
+.TP
|
|
+.BI \-cf\ <config-file>
|
|
+Path to the client configuration file. If unspecified, the default
|
|
+.B /usr/local/etc/dhclient.conf
|
|
+is used.
|
|
+
|
|
+.TP
|
|
+.BI \-sf\ <script-file>
|
|
+Path to the network configuration script invoked by
|
|
+.B dhclient
|
|
+when it gets a lease. If unspecified, the default
|
|
+.B /sbin/dhclient-script
|
|
+is used.
|
|
+
|
|
+.TP
|
|
+.BI \-s\ <server>
|
|
+Specifiy the server IP address or fully qualified domain name to transmit
|
|
+DHCP protocol messages to. Normally,
|
|
+.B dhclient
|
|
+transmits these messages to 255.255.255.255 (the IP limited broadcast
|
|
+address). Overriding this is mostly useful for debugging purposes.
|
|
+
|
|
+.TP
|
|
+.BI \-g\ <relay>
|
|
+Only for debugging. Set the giaddr field of all packets the client
|
|
+sends to the IP address specified. This should not be expected to work
|
|
+in any consistent or useful way.
|
|
+
|
|
+.TP
|
|
+.BI \-n
|
|
+Do not configure any interfaces. Most useful combined with the
|
|
+.B -w
|
|
+option.
|
|
+
|
|
+.TP
|
|
+.BI \-nw
|
|
+Become a daemon process immediately (nowait) rather than waiting until an IP
|
|
+address has been acquired.
|
|
+
|
|
+.TP
|
|
+.BI \-w
|
|
+Keep running even if no network interfaces are found. The
|
|
+.B omshell
|
|
+program can be used to notify the client when a network interface has been
|
|
+added or removed so it can attempt to configure an IP address on that
|
|
+interface.
|
|
+
|
|
+.TP
|
|
+.BI \-B
|
|
+Set the BOOTP broadcast flag in request packets so servers will always
|
|
+broadcast replies.
|
|
+
|
|
+.TP
|
|
+.BI \-I\ <dhcp-client-identifier>
|
|
+Specify the dhcp-client-identifier option to send to the DHCP server.
|
|
+
|
|
+.TP
|
|
+.BI \-H\ <host-name>
|
|
+Specify the host-name option to send to the DHCP server. The host-name
|
|
+string only contains the client's hostname prefix, to which the server will
|
|
+append the ddns-domainname or domain-name options, if any, to derive the
|
|
+fully qualified domain name of the client. The
|
|
+.B -H
|
|
+option cannot be used with the
|
|
+.B -F
|
|
+option.
|
|
+
|
|
+.TP
|
|
+.BI \-F\ <fqdn.fqdn>
|
|
+Specify the fqdn.fqdn option to send to the DHCP server. This option cannot
|
|
+be used with the
|
|
+.B -H
|
|
+option. The fqdn.fqdn option must specify the complete domain name of the
|
|
+client host, which the server may use for dynamic DNS updates.
|
|
+
|
|
+.TP
|
|
+.BI \-V\ <vendor-class-identifier>
|
|
+Specify the vendor-class-identifier option to send to the DHCP server.
|
|
+
|
|
+.TP
|
|
+.BI \-R\ <option>[,<option>...]
|
|
+Specify the list of options the client is to request from the server. The
|
|
+option list must be a single string consisting of option names separated
|
|
+by at least one command and optional space characters. The default option
|
|
+list is:
|
|
+
|
|
+.BR
|
|
+ subnet-mask, broadcast-address, time-offset, routers,
|
|
+.BR
|
|
+ domain-name, domain-name-servers, host-name, nis-domain,
|
|
+.BR
|
|
+ nis-servers, ntp-servers
|
|
+
|
|
The
|
|
-.B -r
|
|
-flag explicitly releases the current lease, and once the lease has been
|
|
-released, the client exits.
|
|
+.B -R
|
|
+option does not append options to the default request, it overrides the
|
|
+default request list. Keep this in mind if you want to request an
|
|
+additional option besides the default request list. You will have to
|
|
+specify all option names for the
|
|
+.B -R
|
|
+parameter.
|
|
+
|
|
+.TP
|
|
+.BI \-T\ <timeout>
|
|
+Specify the time after which
|
|
+.B dhclient
|
|
+will decide that no DHCP servers can be contacted when no responses have been
|
|
+received.
|
|
+
|
|
+.TP
|
|
+.BI \-v
|
|
+Enable verbose log messages.
|
|
+
|
|
.PP
|
|
If the client is killed by a signal (for example at shutdown or reboot)
|
|
it won't execute the
|
|
@@ -253,57 +386,7 @@ or
|
|
it will execute
|
|
.B dhclient-script (8)
|
|
at shutdown with the specific reason for calling the script set.
|
|
-.PP
|
|
-The
|
|
-.B -1
|
|
-flag will cause dhclient to try once to get a lease. If it fails, dhclient
|
|
-exits with exit code two.
|
|
-.PP
|
|
-The DHCP client normally gets its configuration information from
|
|
-.B ETCDIR/dhclient.conf,
|
|
-its lease database from
|
|
-.B DBDIR/dhclient.leases,
|
|
-stores its process ID in a file called
|
|
-.B RUNDIR/dhclient.pid,
|
|
-and configures the network interface using
|
|
-.B CLIENTBINDIR/dhclient-script
|
|
-To specify different names and/or locations for these files, use the
|
|
-.B -cf,
|
|
-.B -lf,
|
|
-.B -pf
|
|
-and
|
|
-.B -sf
|
|
-flags, respectively, followed by the name of the file. This can be
|
|
-particularly useful if, for example,
|
|
-.B DBDIR
|
|
-or
|
|
-.B RUNDIR
|
|
-has not yet been mounted when the DHCP client is started.
|
|
-.PP
|
|
-The DHCP client normally exits if it isn't able to identify any
|
|
-network interfaces to configure. On laptop computers and other
|
|
-computers with hot-swappable I/O buses, it is possible that a
|
|
-broadcast interface may be added after system startup. The
|
|
-.B -w
|
|
-flag can be used to cause the client not to exit when it doesn't find
|
|
-any such interfaces. The
|
|
-.B omshell (1)
|
|
-program can then be used to notify the client when a network interface
|
|
-has been added or removed, so that the client can attempt to configure an IP
|
|
-address on that interface.
|
|
-.PP
|
|
-The DHCP client can be directed not to attempt to configure any interfaces
|
|
-using the
|
|
-.B -n
|
|
-flag. This is most likely to be useful in combination with the
|
|
-.B -w
|
|
-flag.
|
|
-.PP
|
|
-The client can also be instructed to become a daemon immediately, rather
|
|
-than waiting until it has acquired an IP address. This can be done by
|
|
-supplying the
|
|
-.B -nw
|
|
-flag.
|
|
+
|
|
.SH CONFIGURATION
|
|
The syntax of the dhclient.conf(5) file is discussed separately.
|
|
.SH OMAPI
|
|
@@ -338,9 +421,9 @@ do a DHCPRELEASE. To pause it, set its
|
|
resume it, set its state attribute to 4.
|
|
.PP
|
|
.SH FILES
|
|
-.B CLIENTBINDIR/dhclient-script,
|
|
-.B ETCDIR/dhclient.conf, DBDIR/dhclient.leases, RUNDIR/dhclient.pid,
|
|
-.B DBDIR/dhclient.leases~.
|
|
+.B /sbin/dhclient-script,
|
|
+.B /usr/local/etc/dhclient.conf, /private/var/db/dhclient/dhclient.leases, /private/var/run/dhclient.pid,
|
|
+.B /private/var/db/dhclient/dhclient.leases~.
|
|
.SH SEE ALSO
|
|
dhcpd(8), dhcrelay(8), dhclient-script(8), dhclient.conf(5),
|
|
dhclient.leases(5), dhcp-eval(5).
|
|
diff -up dhcp-4.0.0/client/dhclient.conf.5.manpages dhcp-4.0.0/client/dhclient.conf.5
|
|
--- dhcp-4.0.0/client/dhclient.conf.5.manpages 2007-08-23 06:06:08.000000000 -1000
|
|
+++ dhcp-4.0.0/client/dhclient.conf.5 2008-10-23 10:01:34.000000000 -1000
|
|
@@ -186,9 +186,9 @@ responding to the client send the client
|
|
options. Only the option names should be specified in the request
|
|
statement - not option parameters. By default, the DHCP server
|
|
requests the subnet-mask, broadcast-address, time-offset, routers,
|
|
-domain-name, domain-name-servers and host-name options. Note that if
|
|
-you enter a 'request' statement, you over-ride this default and these
|
|
-options will not be requested.
|
|
+domain-name, domain-name-servers host-name, nis-domain, nis-servers,
|
|
+and ntp-servers options. Note that if you enter a 'request' statement,
|
|
+you over-ride this default and these options will not be requested.
|
|
.PP
|
|
In some cases, it may be desirable to send no parameter request list
|
|
at all. To do this, simply write the request statement but specify
|
|
@@ -626,6 +626,18 @@ database and will record the media type
|
|
Whenever the client tries to renew the lease, it will use that same
|
|
media type. The lease must expire before the client will go back to
|
|
cycling through media types.
|
|
+.PP
|
|
+ \fBbootp-broadcast-always;\fR
|
|
+.PP
|
|
+The
|
|
+.B bootp-broadcast-always
|
|
+statement instructs dhclient to always set the bootp broadcast flag in
|
|
+request packets, so that servers will always broadcast replies.
|
|
+This is equivalent to supplying the dhclient -B argument, and has
|
|
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
|
|
+This option is provided as an extension to enable dhclient to work
|
|
+on IBM s390 Linux guests.
|
|
+.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
|
|
@@ -647,12 +659,12 @@ interface "ep0" {
|
|
send host-name "andare.fugue.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-search "fugue.com rc.vix.com home.vix.com";
|
|
prepend domain-name-servers 127.0.0.1;
|
|
request subnet-mask, broadcast-address, time-offset, routers,
|
|
- domain-name, domain-name-servers, host-name;
|
|
+ domain-search, domain-name, domain-name-servers, host-name;
|
|
require subnet-mask, domain-name-servers;
|
|
- script "CLIENTBINDIR/dhclient-script";
|
|
+ script "/sbin/dhclient-script";
|
|
media "media 10baseT/UTP", "media 10base2/BNC";
|
|
}
|
|
|
|
diff -up dhcp-4.0.0/common/dhcp-options.5.manpages dhcp-4.0.0/common/dhcp-options.5
|
|
--- dhcp-4.0.0/common/dhcp-options.5.manpages 2007-09-17 07:52:01.000000000 -1000
|
|
+++ dhcp-4.0.0/common/dhcp-options.5 2008-10-23 09:58:40.000000000 -1000
|
|
@@ -896,6 +896,21 @@ classless IP routing - it does not inclu
|
|
classless IP routing is now the most widely deployed routing standard,
|
|
this option is virtually useless, and is not implemented by any of the
|
|
popular DHCP clients, for example the Microsoft DHCP client.
|
|
+.PP
|
|
+NOTE to Fedora dhclient users:
|
|
+.br
|
|
+dhclient-script interprets trailing 0 octets of the target as indicating
|
|
+the subnet class of the route, so for the following static-routes value:
|
|
+.br
|
|
+ option static-routes 172.0.0.0 172.16.2.254,
|
|
+.br
|
|
+ 192.168.0.0 192.168.2.254;
|
|
+.br
|
|
+dhclient-script will create routes:
|
|
+.br
|
|
+ 172/8 via 172.16.2.254 dev $interface
|
|
+.br
|
|
+ 192.168/16 via 192.168.2.254 dev $interface
|
|
.RE
|
|
.PP
|
|
.nf
|
|
diff -up dhcp-4.0.0/server/dhcpd.conf.5.manpages dhcp-4.0.0/server/dhcpd.conf.5
|
|
--- dhcp-4.0.0/server/dhcpd.conf.5.manpages 2007-11-20 08:34:37.000000000 -1000
|
|
+++ dhcp-4.0.0/server/dhcpd.conf.5 2008-10-23 09:58:40.000000000 -1000
|
|
@@ -513,6 +513,9 @@ pool {
|
|
};
|
|
.fi
|
|
.PP
|
|
+Dynamic BOOTP leases are not compatible with failover, and, as such,
|
|
+you need to disallow BOOTP in pools that you are using failover for.
|
|
+.PP
|
|
The server currently does very little sanity checking, so if you
|
|
configure it wrong, it will just fail in odd ways. I would recommend
|
|
therefore that you either do failover or don't do failover, but don't
|
|
@@ -527,9 +530,9 @@ primary server might look like this:
|
|
failover peer "foo" {
|
|
primary;
|
|
address anthrax.rc.vix.com;
|
|
- port 519;
|
|
+ port 647;
|
|
peer address trantor.rc.vix.com;
|
|
- peer port 520;
|
|
+ peer port 847;
|
|
max-response-delay 60;
|
|
max-unacked-updates 10;
|
|
mclt 3600;
|
|
@@ -588,9 +591,7 @@ statement
|
|
.B port \fIport-number\fR\fB;\fR
|
|
.PP
|
|
The \fBport\fR statement declares the TCP port on which the server
|
|
-should listen for connections from its failover peer. This statement
|
|
-may not currently be omitted, because the failover protocol does not
|
|
-yet have a reserved TCP port number.
|
|
+should listen for connections from its failover peer.
|
|
.RE
|
|
.PP
|
|
The
|
|
@@ -602,10 +603,8 @@ statement
|
|
.PP
|
|
The \fBpeer port\fR statement declares the TCP port to which the
|
|
server should connect to reach its failover peer for failover
|
|
-messages. This statement may not be omitted because the failover
|
|
-protocol does not yet have a reserved TCP port number. The port
|
|
-number declared in the \fBpeer port\fR statement may be the same as
|
|
-the port number declared in the \fBport\fR statement.
|
|
+messages. The port number declared in the \fBpeer port\fR statement
|
|
+may be the same as the port number declared in the \fBport\fR statement.
|
|
.RE
|
|
.PP
|
|
The
|
|
@@ -1272,7 +1271,7 @@ the zone containing PTR records - for IS
|
|
.PP
|
|
.nf
|
|
key DHCP_UPDATER {
|
|
- algorithm HMAC-MD5.SIG-ALG.REG.INT;
|
|
+ algorithm hmac-md5;
|
|
secret pRP5FapFoJ95JEL06sv4PQ==;
|
|
};
|
|
|
|
@@ -1295,7 +1294,7 @@ dhcpd.conf file:
|
|
.PP
|
|
.nf
|
|
key DHCP_UPDATER {
|
|
- algorithm HMAC-MD5.SIG-ALG.REG.INT;
|
|
+ algorithm hmac-md5;
|
|
secret pRP5FapFoJ95JEL06sv4PQ==;
|
|
};
|
|
|
|
@@ -2240,7 +2239,7 @@ statement
|
|
.PP
|
|
.I Name
|
|
should be the name of the DHCP server's lease file. By default, this
|
|
-is DBDIR/dhcpd.leases. This statement \fBmust\fR appear in the outer
|
|
+is /private/var/db/dhcpd/dhcpd.leases. This statement \fBmust\fR appear in the outer
|
|
scope of the configuration file - if it appears in some other scope,
|
|
it will have no effect. Furthermore, it has no effect if overridden
|
|
by the
|
|
@@ -2275,7 +2274,7 @@ statement
|
|
.PP
|
|
.I Name
|
|
is the name of the lease file to use if and only if the server is running
|
|
-in DHCPv6 mode. By default, this is DBDIR/dhcpd6.leases. This statement,
|
|
+in DHCPv6 mode. By default, this is /private/var/db/dhcpd/dhcpd6.leases. This statement,
|
|
like
|
|
.I lease-file-name,
|
|
\fBmust\fR appear in the outer scope of the configuration file. It
|
|
@@ -2433,7 +2432,8 @@ statement
|
|
The \fInext-server\fR statement is used to specify the host address of
|
|
the server from which the initial boot file (specified in the
|
|
\fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
|
|
-be a numeric IP address or a domain name.
|
|
+be a numeric IP address or a domain name. If no \fInext-server\fR statement
|
|
+applies to a given client, the address 0.0.0.0 is used.
|
|
.RE
|
|
.PP
|
|
The
|
|
@@ -2478,7 +2478,7 @@ statement
|
|
.I Name
|
|
should be the name of the DHCP server's process ID file. This is the
|
|
file in which the DHCP server's process ID is stored when the server
|
|
-starts. By default, this is RUNDIR/dhcpd.pid. Like the
|
|
+starts. By default, this is /private/var/run/dhcpd.pid. Like the
|
|
.I lease-file-name
|
|
statement, this statement must appear in the outer scope
|
|
of the configuration file. It has no effect if overridden by the
|
|
@@ -2496,7 +2496,7 @@ statement
|
|
.PP
|
|
.I Name
|
|
is the name of the pid file to use if and only if the server is running
|
|
-in DHCPv6 mode. By default, this is DBDIR/dhcpd6.pid. This statement,
|
|
+in DHCPv6 mode. By default, this is /private/var/db/dhcpd/dhcpd6.pid. This statement,
|
|
like
|
|
.I pid-file-name,
|
|
\fBmust\fR appear in the outer scope of the configuration file. It
|