Commit 892ff5e3 authored by Shawn Routhier's avatar Shawn Routhier
Browse files

[v4_1_esv]

[master]
Move the dhclient.conf and dhcpd.conf files to *.example
to avoid overwriting them during installation.
[ISC-Bugs #19337]
parent 8a2b85af
...@@ -57,8 +57,8 @@ DHCP server documentation is in the dhcpd man page. Information about ...@@ -57,8 +57,8 @@ DHCP server documentation is in the dhcpd man page. Information about
the DHCP server lease database is in the dhcpd.leases man page. the DHCP server lease database is in the dhcpd.leases man page.
Server configuration documentation is in the dhcpd.conf man page as Server configuration documentation is in the dhcpd.conf man page as
well as the dhcp-options man page. A sample DHCP server well as the dhcp-options man page. A sample DHCP server
configuration is in the file server/dhcpd.conf. The source for the configuration is in the file server/dhcpd.conf.example. The source for
dhcpd, dhcpd.leases and dhcpd.conf man pages is in the server/ sub- the dhcpd, dhcpd.leases and dhcpd.conf man pages is in the server/ sub-
directory in the distribution. The source for the dhcp-options.5 directory in the distribution. The source for the dhcp-options.5
man page is in the common/ subdirectory. man page is in the common/ subdirectory.
......
...@@ -104,6 +104,12 @@ work on other platforms. Please report any problems and suggested fixes to ...@@ -104,6 +104,12 @@ work on other platforms. Please report any problems and suggested fixes to
- Tidy up some compiler issues in the debug code - Tidy up some compiler issues in the debug code
[ISC-Bugs #26460] [ISC-Bugs #26460]
- Move the dhcpd.conf exmample file to dhcpd.conf.example to avoid
overwriting the dhcpd.conf file when installing a new version of
ISC DHCP. The user will now need to manual copy and edit the
dhcpd.conf file as desired.
[ISC-Bugs #19337]
Changes since 4.1-ESV-R6 Changes since 4.1-ESV-R6
- Existing legacy unit-tests have been migrated to Automated Test - Existing legacy unit-tests have been migrated to Automated Test
......
dist_sysconf_DATA = dhclient.conf dist_sysconf_DATA = dhclient.conf.example
sbin_PROGRAMS = dhclient sbin_PROGRAMS = dhclient
dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
......
...@@ -167,7 +167,7 @@ target_alias = @target_alias@ ...@@ -167,7 +167,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
dist_sysconf_DATA = dhclient.conf dist_sysconf_DATA = dhclient.conf.example
dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/netbsd scripts/nextstep scripts/openbsd \
......
...@@ -6,7 +6,7 @@ SUBDIRS = . tests ...@@ -6,7 +6,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
dist_sysconf_DATA = dhcpd.conf dist_sysconf_DATA = dhcpd.conf.example
sbin_PROGRAMS = dhcpd sbin_PROGRAMS = dhcpd
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
......
...@@ -188,7 +188,7 @@ top_srcdir = @top_srcdir@ ...@@ -188,7 +188,7 @@ top_srcdir = @top_srcdir@
# production code. Sadly, we are not there yet. # production code. Sadly, we are not there yet.
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
dist_sysconf_DATA = dhcpd.conf dist_sysconf_DATA = dhcpd.conf.example
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
dhcpv6.c mdb6.c dhcpv6.c mdb6.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment