From: Shawn Routhier <sar@isc.org>
Date: Mon, 19 Nov 2012 19:42:38 +0000 (-0800)
Subject: [master]
X-Git-Tag: v4_3_0a1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff4e0a221e1f524dc746db4bf08f3ddfc6ecb28;p=thirdparty%2Fdhcp.git

[master]
Move the dhclient.conf and dhcpd.conf files to *.example
to avoid overwriting them during installation.
---

diff --git a/README b/README
index 7e49c4899..592dae23c 100644
--- a/README
+++ b/README
@@ -58,8 +58,8 @@ DHCP server documentation is in the dhcpd man page.  Information about
 the DHCP server lease database is in the dhcpd.leases man page.
 Server configuration documentation is in the dhcpd.conf man page as
 well as the dhcp-options man page.   A sample DHCP server
-configuration is in the file server/dhcpd.conf.   The source for the
-dhcpd, dhcpd.leases and dhcpd.conf man pages is in the server/ sub-
+configuration is in the file server/dhcpd.conf.example.   The source for
+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
 man page is in the common/ subdirectory.
 
diff --git a/RELNOTES b/RELNOTES
index 40088246b..12ddfc8a6 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -172,6 +172,12 @@ work on other platforms. Please report any problems and suggested fixes to
 - Tidy up some compiler issues in the debug code
   [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.2.3
 
 ! Add a check for a null pointer before calling the regexec function.
diff --git a/client/Makefile.am b/client/Makefile.am
index 57c6ac931..39ddf6f65 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,4 +1,4 @@
-dist_sysconf_DATA = dhclient.conf
+dist_sysconf_DATA = dhclient.conf.example
 sbin_PROGRAMS = dhclient
 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
diff --git a/client/Makefile.in b/client/Makefile.in
index 961f5fa25..1664f43b2 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -168,7 +168,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-dist_sysconf_DATA = dhclient.conf
+dist_sysconf_DATA = dhclient.conf.example
 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
 		   scripts/netbsd scripts/nextstep scripts/openbsd \
diff --git a/client/dhclient.conf b/client/dhclient.conf.example
similarity index 100%
rename from client/dhclient.conf
rename to client/dhclient.conf.example
diff --git a/server/Makefile.am b/server/Makefile.am
index 6cd3329f5..dc5d4f3d5 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
 
-dist_sysconf_DATA = dhcpd.conf
+dist_sysconf_DATA = dhcpd.conf.example
 sbin_PROGRAMS = dhcpd
 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 \
diff --git a/server/Makefile.in b/server/Makefile.in
index ba0167de2..ea381ddfc 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -195,7 +195,7 @@ top_srcdir = @top_srcdir@
 # production code. Sadly, we are not there yet.
 SUBDIRS = . tests
 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 \
 		omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
 		dhcpv6.c mdb6.c ldap.c ldap_casa.c
diff --git a/server/dhcpd.conf b/server/dhcpd.conf.example
similarity index 100%
rename from server/dhcpd.conf
rename to server/dhcpd.conf.example