Commit ba1da0cf authored by Michael Gilbert's avatar Michael Gilbert

release 4.3.3-9

parent f121779c
isc-dhcp (4.3.3-9) unstable; urgency=medium
* Update standards version.
* Drop manpage hyphens patch.
* Install upstream changelogs.
* Install an example dhcpd6.conf file.
* Install upstream's README file (closes: #791788).
* Fix incorrect path in dhcp-lease-list script (closes: #814693).
* Add a status option to the relay init stript (closes: #726604).
* Check IPv4 and IPv6 server status independently (closes: #815180).
* Use /etc/dhcp/dhcpd6.conf for the IPv6 server settings (closes: #816008).
* Touch dhcpd.leases during postinst if it doesn't exist (closes: #765910).
-- Michael Gilbert <mgilbert@debian.org> Sun, 28 Feb 2016 20:38:52 +0000
isc-dhcp (4.3.3-8) unstable; urgency=medium
* Fix typos in recent changes to the server init script.
......
......@@ -16,7 +16,7 @@ Build-Depends:
libssl-dev,
libldap2-dev,
libbind-export-dev (>= 1:9.9.5.dfsg-4.3),
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Package: isc-dhcp-server
Priority: optional
......
#
# Sample configuration file for ISC dhcpd for Debian
#
#
# The ddns-updates-style parameter controls whether or not the server will
# attempt to do a DNS update when a lease is confirmed. We default to the
# behavior of the version 2 packages ('none', since DHCP v2 didn't
# have support for DDNS.)
ddns-update-style none;
# option definitions common to all supported networks...
option domain-name "example.org";
option domain-name-servers ns1.example.org, ns2.example.org;
default-lease-time 600;
max-lease-time 7200;
# If this DHCP server is the official DHCP server for the local
# network, the authoritative directive should be uncommented.
#authoritative;
# Use this to send dhcp log messages to a different log file (you also
# have to hack syslog.conf to complete the redirection).
log-facility local7;
# No service will be given on this subnet, but declaring it helps the
# DHCP server to understand the network topology.
#subnet 10.152.187.0 netmask 255.255.255.0 {
#}
# This is a very basic subnet declaration.
#subnet 10.254.239.0 netmask 255.255.255.224 {
# range 10.254.239.10 10.254.239.20;
# option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
#}
# This declaration allows BOOTP clients to get dynamic addresses,
# which we don't really recommend.
#subnet 10.254.239.32 netmask 255.255.255.224 {
# range dynamic-bootp 10.254.239.40 10.254.239.60;
# option broadcast-address 10.254.239.31;
# option routers rtr-239-32-1.example.org;
#}
# A slightly different configuration for an internal subnet.
#subnet 10.5.5.0 netmask 255.255.255.224 {
# range 10.5.5.26 10.5.5.30;
# option domain-name-servers ns1.internal.example.org;
# option domain-name "internal.example.org";
# option routers 10.5.5.1;
# option broadcast-address 10.5.5.31;
# default-lease-time 600;
# max-lease-time 7200;
#}
# Hosts which require special configuration options can be listed in
# host statements. If no address is specified, the address will be
# allocated dynamically (if possible), but the host-specific information
# will still come from the host declaration.
#host passacaglia {
# hardware ethernet 0:0:c0:5d:bd:95;
# filename "vmunix.passacaglia";
# server-name "toccata.fugue.com";
#}
# Fixed IP addresses can also be specified for hosts. These addresses
# should not also be listed as being available for dynamic assignment.
# Hosts for which fixed IP addresses have been specified can boot using
# BOOTP or DHCP. Hosts for which no fixed address is specified can only
# be booted with DHCP, unless there is an address range on the subnet
# to which a BOOTP client is connected which has the dynamic-bootp flag
# set.
#host fantasia {
# hardware ethernet 08:00:07:26:c0:a5;
# fixed-address fantasia.fugue.com;
#}
# You can declare a class of clients and then do address allocation
# based on that. The example below shows a case where all clients
# in a certain class get addresses on the 10.17.224/24 subnet, and all
# other clients get addresses on the 10.0.29/24 subnet.
#class "foo" {
# match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
#}
#shared-network 224-29 {
# subnet 10.17.224.0 netmask 255.255.255.0 {
# option routers rtr-224.example.org;
# }
# subnet 10.0.29.0 netmask 255.255.255.0 {
# option routers rtr-29.example.org;
# }
# pool {
# allow members of "foo";
# range 10.17.224.10 10.17.224.250;
# }
# pool {
# deny members of "foo";
# range 10.0.29.10 10.0.29.230;
# }
#}
README
debian/tmp/changelog
README
debian/tmp/changelog
README
RELNOTES
debian/tmp/changelog
README
debian/tmp/changelog
README
debian/tmp/changelog
......@@ -46,6 +46,9 @@ case "$1" in
stop)
start-stop-daemon --stop --quiet --pidfile $DHCRELAYPID
;;
status)
test -e $DHCRELAYPID
;;
restart | force-reload)
$0 stop
sleep 2
......
README
debian/tmp/changelog
contrib/ldap/README.ldap
contrib/ldap/dhcp.schema
contrib/ldap/dhcpd-conf-to-ldap
README
debian/tmp/changelog
......@@ -40,7 +40,7 @@ DESC6="ISC DHCPv6 server"
# use already specified config file or fallback to defaults
DHCPDv4_CONF=${DHCPDv4_CONF:-/etc/dhcp/dhcpd.conf}
DHCPDv6_CONF=${DHCPDv6_CONF:-/etc/dhcp/dhcpd.conf}
DHCPDv6_CONF=${DHCPDv6_CONF:-/etc/dhcp/dhcpd6.conf}
# try to read pid file name from config file or fallback to defaults
if [ -z "$DHCPDv4_PID" ]; then
......@@ -142,7 +142,6 @@ case "$1" in
echo "Migrating automatically for now, but this will go away in the future." >&2
INTERFACESv4="$INTERFACES"
fi
if test -n "$INTERFACESv4"; then
start_daemon "-4" "$DHCPDv4_CONF" "$NAME4" \
"$DHCPDv4_PID" "$DESC4" "$INTERFACESv4"
......@@ -164,12 +163,17 @@ case "$1" in
fi
;;
status)
echo -n "Status of $DESC4: "
check_status -v $DHCPv4_PID $NAME4
STATUSv4="$?"
echo -n "Status of $DESC6: "
check_status -v $DHCPv6_PID $NAME6
exit "$(($STATUSv4|$?))"
if test -n "$INTERFACES" -a -z "$INTERFACESv4"; then
INTERFACESv4="$INTERFACES"
fi
if test -n "$INTERFACESv4"; then
echo -n "Status of $DESC4: "
check_status -v $DHCPDv4_PID $NAME4 || exit $?
fi
if test -n "$INTERFACESv6"; then
echo -n "Status of $DESC6: "
check_status -v $DHCPDv6_PID $NAME6 || exit $?
fi
;;
*)
echo "Usage: $0 {start|stop|restart|force-reload|status}"
......
......@@ -2,4 +2,5 @@ usr/sbin/dhcpd
usr/bin/omshell
debian/dhcpd.conf etc/dhcp
debian/tmp/dhcpd.conf etc/dhcp
debian/tmp/dhcpd6.conf etc/dhcp
......@@ -38,7 +38,7 @@ umask 022
# Path to dhcpd's config file (default: /etc/dhcp/dhcpd.conf).
#DHCPDv4_CONF=/etc/dhcp/dhcpd.conf
#DHCPDv6_CONF=/etc/dhcp/dhcpd.conf
#DHCPDv6_CONF=/etc/dhcp/dhcpd6.conf
# Path to dhcpd's PID file (default: /var/run/dhcpd.pid).
#DHCPDv4_PID=/var/run/dhcpd.pid
......@@ -73,6 +73,8 @@ db_stop
test ! -x /sbin/restorecon || restorecon /var/lib/dhcp/dhcpd.leases
test -e /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
#DEBHELPER#
exit 0
description: comment out dhcpd.conf example settings (the user needs to set these)
author: Michael Gilbert <mgilbert@debian.org>
--- a/server/dhcpd.conf.example
+++ b/server/dhcpd.conf.example
@@ -10,8 +10,11 @@ option domain-name-servers ns1.example.o
default-lease-time 600;
max-lease-time 7200;
-# Use this to enble / disable dynamic dns updates globally.
-#ddns-update-style none;
+# The ddns-updates-style parameter controls whether or not the server will
+# attempt to do a DNS update when a lease is confirmed. We default to the
+# behavior of the version 2 packages ('none', since DHCP v2 didn't
+# have support for DDNS.)
+ddns-update-style none;
# If this DHCP server is the official DHCP server for the local
# network, the authoritative directive should be uncommented.
@@ -19,51 +22,51 @@ max-lease-time 7200;
# Use this to send dhcp log messages to a different log file (you also
# have to hack syslog.conf to complete the redirection).
-log-facility local7;
+#log-facility local7;
# No service will be given on this subnet, but declaring it helps the
# DHCP server to understand the network topology.
-subnet 10.152.187.0 netmask 255.255.255.0 {
-}
+#subnet 10.152.187.0 netmask 255.255.255.0 {
+#}
# This is a very basic subnet declaration.
-subnet 10.254.239.0 netmask 255.255.255.224 {
- range 10.254.239.10 10.254.239.20;
- option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-}
+#subnet 10.254.239.0 netmask 255.255.255.224 {
+# range 10.254.239.10 10.254.239.20;
+# option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
+#}
# This declaration allows BOOTP clients to get dynamic addresses,
# which we don't really recommend.
-subnet 10.254.239.32 netmask 255.255.255.224 {
- range dynamic-bootp 10.254.239.40 10.254.239.60;
- option broadcast-address 10.254.239.31;
- option routers rtr-239-32-1.example.org;
-}
+#subnet 10.254.239.32 netmask 255.255.255.224 {
+# range dynamic-bootp 10.254.239.40 10.254.239.60;
+# option broadcast-address 10.254.239.31;
+# option routers rtr-239-32-1.example.org;
+#}
# A slightly different configuration for an internal subnet.
-subnet 10.5.5.0 netmask 255.255.255.224 {
- range 10.5.5.26 10.5.5.30;
- option domain-name-servers ns1.internal.example.org;
- option domain-name "internal.example.org";
- option routers 10.5.5.1;
- option broadcast-address 10.5.5.31;
- default-lease-time 600;
- max-lease-time 7200;
-}
+#subnet 10.5.5.0 netmask 255.255.255.224 {
+# range 10.5.5.26 10.5.5.30;
+# option domain-name-servers ns1.internal.example.org;
+# option domain-name "internal.example.org";
+# option routers 10.5.5.1;
+# option broadcast-address 10.5.5.31;
+# default-lease-time 600;
+# max-lease-time 7200;
+#}
# Hosts which require special configuration options can be listed in
# host statements. If no address is specified, the address will be
# allocated dynamically (if possible), but the host-specific information
# will still come from the host declaration.
-host passacaglia {
- hardware ethernet 0:0:c0:5d:bd:95;
- filename "vmunix.passacaglia";
- server-name "toccata.fugue.com";
-}
+#host passacaglia {
+# hardware ethernet 0:0:c0:5d:bd:95;
+# filename "vmunix.passacaglia";
+# server-name "toccata.fugue.com";
+#}
# Fixed IP addresses can also be specified for hosts. These addresses
# should not also be listed as being available for dynamic assignment.
@@ -72,33 +75,33 @@ host passacaglia {
# be booted with DHCP, unless there is an address range on the subnet
# to which a BOOTP client is connected which has the dynamic-bootp flag
# set.
-host fantasia {
- hardware ethernet 08:00:07:26:c0:a5;
- fixed-address fantasia.fugue.com;
-}
+#host fantasia {
+# hardware ethernet 08:00:07:26:c0:a5;
+# fixed-address fantasia.fugue.com;
+#}
# You can declare a class of clients and then do address allocation
# based on that. The example below shows a case where all clients
# in a certain class get addresses on the 10.17.224/24 subnet, and all
# other clients get addresses on the 10.0.29/24 subnet.
-class "foo" {
- match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-}
-
-shared-network 224-29 {
- subnet 10.17.224.0 netmask 255.255.255.0 {
- option routers rtr-224.example.org;
- }
- subnet 10.0.29.0 netmask 255.255.255.0 {
- option routers rtr-29.example.org;
- }
- pool {
- allow members of "foo";
- range 10.17.224.10 10.17.224.250;
- }
- pool {
- deny members of "foo";
- range 10.0.29.10 10.0.29.230;
- }
-}
+#class "foo" {
+# match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
+#}
+
+#shared-network 224-29 {
+# subnet 10.17.224.0 netmask 255.255.255.0 {
+# option routers rtr-224.example.org;
+# }
+# subnet 10.0.29.0 netmask 255.255.255.0 {
+# option routers rtr-29.example.org;
+# }
+# pool {
+# allow members of "foo";
+# range 10.17.224.10 10.17.224.250;
+# }
+# pool {
+# deny members of "foo";
+# range 10.0.29.10 10.0.29.230;
+# }
+#}
--- a/doc/examples/dhcpd-dhcpv6.conf
+++ b/doc/examples/dhcpd-dhcpv6.conf
@@ -42,65 +42,61 @@ option dhcp6.domain-search "test.example
# (set to 6 hours)
option dhcp6.info-refresh-time 21600;
-# The path of the lease file
-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases";
-
# Static definition (must be global)
-host myclient {
- # The entry is looked up by this
- host-identifier option
- dhcp6.client-id 00:01:00:01:00:04:93:e0:00:00:00:00:a2:a2;
-
- # A fixed address
- fixed-address6 3ffe:501:ffff:100::1234;
-
- # A fixed prefix
- fixed-prefix6 3ffe:501:ffff:101::/64;
-
- # Override of the global definitions,
- # works only when a resource (address or prefix) is assigned
- option dhcp6.name-servers 3ffe:501:ffff:100:200:ff:fe00:4f4e;
-
- # For debug (to see when the entry statements are executed)
- # (log "sol" when a matching Solicitation is received)
- ##if packet(0,1) = 1 { log(debug,"sol"); }
-}
-
-host otherclient {
- # This host entry is hopefully matched if the client supplies a DUID-LL
- # or DUID-LLT containing this MAC address.
- hardware ethernet 01:00:80:a2:55:67;
-
- fixed-address6 3ffe:501:ffff:100::4321;
-}
+#host myclient {
+# # The entry is looked up by this
+# host-identifier option
+# dhcp6.client-id 00:01:00:01:00:04:93:e0:00:00:00:00:a2:a2;
+#
+# # A fixed address
+# fixed-address6 3ffe:501:ffff:100::1234;
+#
+# # A fixed prefix
+# fixed-prefix6 3ffe:501:ffff:101::/64;
+#
+# # Override of the global definitions,
+# # works only when a resource (address or prefix) is assigned
+# option dhcp6.name-servers 3ffe:501:ffff:100:200:ff:fe00:4f4e;
+#
+# # For debug (to see when the entry statements are executed)
+# # (log "sol" when a matching Solicitation is received)
+# ##if packet(0,1) = 1 { log(debug,"sol"); }
+#}
+#
+#host otherclient {
+# # This host entry is hopefully matched if the client supplies a DUID-LL
+# # or DUID-LLT containing this MAC address.
+# hardware ethernet 01:00:80:a2:55:67;
+#
+# fixed-address6 3ffe:501:ffff:100::4321;
+#}
# The subnet where the server is attached
# (i.e., the server has an address in this subnet)
-subnet6 3ffe:501:ffff:100::/64 {
- # Two addresses available to clients
- # (the third client should get NoAddrsAvail)
- range6 3ffe:501:ffff:100::10 3ffe:501:ffff:100::11;
-
- # Use the whole /64 prefix for temporary addresses
- # (i.e., direct application of RFC 4941)
- range6 3ffe:501:ffff:100:: temporary;
-
- # Some /64 prefixes available for Prefix Delegation (RFC 3633)
- prefix6 3ffe:501:ffff:100:: 3ffe:501:ffff:111:: /64;
-}
+#subnet6 3ffe:501:ffff:100::/64 {
+# # Two addresses available to clients
+# # (the third client should get NoAddrsAvail)
+# range6 3ffe:501:ffff:100::10 3ffe:501:ffff:100::11;
+#
+# # Use the whole /64 prefix for temporary addresses
+# # (i.e., direct application of RFC 4941)
+# range6 3ffe:501:ffff:100:: temporary;
+#
+# # Some /64 prefixes available for Prefix Delegation (RFC 3633)
+# prefix6 3ffe:501:ffff:100:: 3ffe:501:ffff:111:: /64;
+#}
# A second subnet behind a relay agent
-subnet6 3ffe:501:ffff:101::/64 {
- range6 3ffe:501:ffff:101::10 3ffe:501:ffff:101::11;
-
- # Override of the global definitions,
- # works only when a resource (address or prefix) is assigned
- option dhcp6.name-servers 3ffe:501:ffff:101:200:ff:fe00:3f3e;
-
-}
+#subnet6 3ffe:501:ffff:101::/64 {
+# range6 3ffe:501:ffff:101::10 3ffe:501:ffff:101::11;
+#
+# # Override of the global definitions,
+# # works only when a resource (address or prefix) is assigned
+# option dhcp6.name-servers 3ffe:501:ffff:101:200:ff:fe00:3f3e;
+#
+#}
# A third subnet behind a relay agent chain
-subnet6 3ffe:501:ffff:102::/64 {
- range6 3ffe:501:ffff:102::10 3ffe:501:ffff:102::11;
-}
-
+#subnet6 3ffe:501:ffff:102::/64 {
+# range6 3ffe:501:ffff:102::10 3ffe:501:ffff:102::11;
+#}
description: use the correct path to the dhcpd leases file
author: Michael Gilbert <mgilbert@debian.org>
--- a/contrib/dhcp-lease-list.pl
+++ b/contrib/dhcp-lease-list.pl
@@ -19,7 +19,7 @@ use strict;
use warnings;
use POSIX qw(strftime);
-my $LEASES = '/var/db/dhcpd.leases';
+my $LEASES = '/var/lib/dhcp/dhcpd.leases';
my @all_leases;
my @leases;
description: avoid undefined manpage macro
author: Michael Gilbert <mgilbert@debian.org>
--- a/dhcpctl/dhcpctl.3
+++ b/dhcpctl/dhcpctl.3
@@ -491,5 +491,4 @@ omapi(3), omshell(1), dhcpd(8), dhclient
.Em dhcpctl
is maintained by ISC. To learn more about Internet Systems Consortium,
see
-.B https://www.isc.org
-
+https://www.isc.org
description: escape hyphens in manpages
author: Michael Gilbert <mgilbert@debian.org>
--- a/client/dhclient.8
+++ b/client/dhclient.8
@@ -232,7 +232,7 @@ parameters. This is the default and can
.BI \-6
Use the DHCPv6 protocol to obtain whatever IPv6 addresses are available
along with configuration parameters. It cannot be combined with
-\fB\-4\fR. The \fB\-S -T -P -N\fR and
+\fB\-4\fR. The \fB\-S \-T \-P \-N\fR and
\fB\-D\fR arguments provide more control over aspects of the DHCPv6
processing. Note: it is not recommended to mix queries of different
types together or even to share the lease file between them.
--- a/server/dhcpd.8
+++ b/server/dhcpd.8
@@ -105,7 +105,7 @@ dhcpd - Dynamic Host Configuration Proto
]
.B dhcpd
---version
+\-\-version
.SH DESCRIPTION
The Internet Systems Consortium DHCP Server, dhcpd, implements the
Dynamic Host Configuration Protocol (DHCP) and the Internet Bootstrap
--- a/client/dhclient-script.8
+++ b/client/dhclient-script.8
@@ -191,7 +191,7 @@ The dhclient has been informed to shut d
dhclient-script should unconfigure or shutdown the interface as
appropriate.
.SH RELEASE
-The dhclient has been executed using the -r flag, indicating that the
+The dhclient has been executed using the \-r flag, indicating that the
administrator wishes it to release its lease(s). dhclient-script should
unconfigure or shutdown the interface.
.SH NBI
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -1310,7 +1310,7 @@ dnssec-keygen. If you are using BIND 9\
dnssec-keygen, the above key would be created as follows:
.PP
.nf
- dnssec-keygen -a HMAC-MD5 -b 128 -n USER DHCP_UPDATER
+ dnssec-keygen \-a HMAC-MD5 \-b 128 \-n USER DHCP_UPDATER
.fi
.PP
The key name, algorithm, and secret must match that being used by the DNS
@@ -1881,7 +1881,7 @@ A short min-lease-time enforces a step c
min-lease-time allows for a gradual change.
\fItime\fR is either second since epoch, or a UTC time string e.g.
4 2007/08/24 09:14:32 or a string with time zone offset in seconds
-e.g. 4 2007/08/24 11:14:32 -7200
+e.g. 4 2007/08/24 11:14:32 \-7200
.SH REFERENCE: PARAMETERS
The
.I adaptive-lease-time-threshold
@@ -2137,7 +2137,7 @@ a second).
.PP
Please note that as delayed-ack is currently experimental, the delayed-ack
feature is not compiled in by default, but must be enabled at compile time
-with \'./configure --enable-delayed-ack\'.
+with \'./configure \-\-enable-delayed-ack\'.
.RE
.PP
The
@@ -2577,8 +2577,8 @@ The syntax of the \fIsyslog.conf\fR file
operating systems - consult the \fIsyslog.conf\fR manual page to be
sure. To get syslog to start logging to the new file, you must first
create the file with correct ownership and permissions (usually, the
-same owner and permissions of your /var/log/messages or
-/usr/adm/messages file should be fine) and send a SIGHUP to syslogd.
+same owner and permissions of your /var/log/messages
+file should be fine) and send a SIGHUP to syslogd.
Some systems support log rollover using a shell script or program
called newsyslog or logrotate, and you may be able to configure this
as well so that your log file doesn't grow uncontrollably.
--- a/relay/dhcrelay.8
+++ b/relay/dhcrelay.8
@@ -137,11 +137,11 @@ downstream to the source of the original
.PP
\fIProtocol selection options:\fR
.TP
--6
+\-6
Run dhcrelay as a DHCPv6 relay agent. Incompatible with the \fB-4\fR
option.
.TP
--4
+\-4
Run dhcrelay as a DHCPv4/BOOTP relay agent. This is the default mode of
operation, so the argument is not necessary, but may be specified for
clarity. Incompatible with \fB-6\fR.
@@ -153,32 +153,32 @@ the command line, to which DHCP/BOOTP qu
.PP
\fIOptions available for both DHCPv4 and DHCPv6:\fR
.TP
--c COUNT
+\-c COUNT
Maximum hop count. When forwarding packets, dhcrelay discards packets
which have reached a hop count of COUNT. Default is 10. Maximum is 255.
.TP
--d
+\-d
Force dhcrelay to run as a foreground process. Useful when running
dhcrelay under a debugger, or running out of inittab on System V systems.
.TP
--p PORT
+\-p PORT
Listen and transmit on port PORT. This is mostly useful for debugging
purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6.
.TP
--q
+\-q
Quiet mode. Prevents dhcrelay6 from printing its network configuration
on startup.
.TP
--pf pid-file
+\-pf pid-file
Path to alternate pid file.
.TP
---no-pid
+\-\-no-pid
Option to disable writing pid files. By default the program
will write a pid file.
.PP
\fIOptions available in DHCPv4 mode only:\fR
.TP
--a
+\-a
Append an agent option field to each request before forwarding it to
the server. Agent option fields in responses sent from servers to
clients will be stripped before forwarding such responses back to the
@@ -188,25 +188,25 @@ be the printable name of the interface o
received. The client supports inclusion of a Remote ID suboption as well,
but this is not used by default.
.TP
--A LENGTH
+\-A LENGTH
Specify the maximum packet size to send to a DHCPv4/BOOTP server. This
might be done to allow sufficient space for addition of relay agent
options while still fitting into the Ethernet MTU size.
.TP
--D
+\-D
Drop packets from upstream servers if they contain Relay Agent
Information options that indicate they were generated in response to
a query that came via a different relay agent. If this option is not
specified, such packets will be relayed anyway.
.TP
--i \fIifname\fR
+\-i \fIifname\fR
Listen for DHCPv4/BOOTP queries on interface \fIifname\fR. Multiple
interfaces may be specified by using more than one \fB-i\fR option. If
no interfaces are specified on the command line, dhcrelay will identify
all network interfaces, eliminating non-broadcast interfaces if possible,
and attempt to listen on all of them.
.TP
--m \fIappend\fR|\fIreplace\fR|\fIforward\fR|\fIdiscard\fR
+\-m \fIappend\fR|\fIreplace\fR|\fIforward\fR|\fIdiscard\fR
Control the handling of incoming DHCPv4 packets which already contain
relay agent options. If such a packet does not have \fIgiaddr\fR set in
its header, the DHCP standard requires that the packet be discarded.
@@ -220,19 +220,19 @@ To use this option you must also enable
.PP
\fIOptions available in DHCPv6 mode only:\fR
.TP
--I
+\-I
Force use of the DHCPv6 Interface-ID option. This option is
automatically sent when there are two or more downstream interfaces
in use, to disambiguate between them. The \fB-I\fR option causes
dhcrelay to send the option even if there is only one downstream
interface.
.TP
--s subscriber-id
+\-s subscriber-id
Add an option with the specified subscriber-id into the packet. This
feature is for testing rather than production as it will put the same
subscriber-id into the packet for all clients.
.TP
--l [\fIaddress%\fR]\fIifname\fR[\fI#index\fR]
+\-l [\fIaddress%\fR]\fIifname\fR[\fI#index\fR]
Specifies the ``lower'' network interface for DHCPv6 relay mode: the
interface on which queries will be received from clients or from other
relay agents. At least one \fB-l\fR option must be included in the command
@@ -242,7 +242,7 @@ if it isn't, dhcrelay will use the first
on the interface. The optional \fI#index\fR parameter specifies the
interface index.
.TP
--u [\fIaddress%\fR]\fIifname\fR
+\-u [\fIaddress%\fR]\fIifname\fR
Specifies the ``upper'' network interface for DHCPv6 relay mode: the
interface to which queries from clients and other relay agents should be
forwarded. At least one \fB-u\fR option must be included in the command
--- a/server/dhcpd.leases.5
+++ b/server/dhcpd.leases.5
@@ -109,7 +109,7 @@ Lease times are specified in Universal C
the local time zone. There is probably nowhere in the world where the
times recorded on a lease are always the same as wall clock times. On
most unix machines, you can display the current time in UTC by typing
-\fBdate -u\fR.
+\fBdate \-u\fR.
.PP
If the \fBdb-time-format\fR was configured to \fIlocal\fR, then
the \fIdate\fR fields appear as follows:
--- a/dhcpctl/dhcpctl.3
+++ b/dhcpctl/dhcpctl.3
@@ -491,5 +491,4 @@ omapi(3), omshell(1), dhcpd(8), dhclient
.Em dhcpctl
is maintained by ISC. To learn more about Internet Systems Consortium,
see
-.B https://www.isc.org
-
+https://www.isc.org