[v4_1_esv] Added support for --with-srv-conf-file configuration parameter.

    Merged 'rt44765'

diff --git a/RELNOTES b/RELNOTES
index 2556a8065f3c5a804e4b0c543447d75ce266e298..00fa829270a417004c358be9f97f05fbdfca1f27 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,7 +1,7 @@
               Internet Systems Consortium DHCP Distribution
 
                            Version 4.1-ESV-R14
-                            5 Octoboer 2016
+                            5 October 2016
 
                               Release Notes
 
@@ -125,6 +125,10 @@ by Eric Young (eay@cryptsoft.com).
   the issue to our attention.
   [ISC-Bugs #41976]
 
+- Added new compile time option --with-srv-conf-file which specifies a
+  default location of the server configuration file.
+  [ISC-Bugs #44765]
+
                        Changes since 4.1-ESV-R14b1
 - None
 

diff --git a/configure b/configure
index d2bd49b17512655139d2951a83e87ee95fec5caf..4e7867a5f34bc849577061e88ffb4a0167c458b5 100755 (executable)
--- a/configure
+++ b/configure
@@ -749,6 +749,7 @@ enable_use_sockets
 enable_secs_byteorder
 enable_log_pid
 with_atf
+with_srv_conf_file
 with_srv_lease_file
 with_srv6_lease_file
 with_cli_lease_file
@@ -1419,6 +1420,9 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-atf=PATH         specify location where atf was installed
+  --with-srv-conf-file=PATH
+                          Default file containing dhcpd configuration (default
+                          is typically /etc/dhcpd.conf)
   --with-srv-lease-file=PATH
                           File for dhcpd leases (default is
                           LOCALSTATEDIR/db/dhcpd.leases)
@@ -5637,6 +5641,18 @@ case "$localstatedir" in
                ;;
 esac
 
+# Default server configuration file.
+
+# Check whether --with-srv-conf-file was given.
+if test "${with_srv_conf_file+set}" = set; then :
+  withval=$with_srv_conf_file;
+cat >>confdefs.h <<_ACEOF
+#define _PATH_DHCPD_CONF "$withval"
+_ACEOF
+
+fi
+
+
 # Allow specification of alternate state files
 
 # Check whether --with-srv-lease-file was given.

diff --git a/configure.ac b/configure.ac
index 5263ccb0918f95a0e3f5a546fa25e0c588b2d745..b0d5edfbdb0ca115cc231126cc0a3816bd9e6fb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -277,6 +277,13 @@ case "$localstatedir" in
                ;;
 esac
 
+# Default server configuration file.
+AC_ARG_WITH(srv-conf-file,
+       AS_HELP_STRING([--with-srv-conf-file=PATH],[Default file containing dhcpd configuration
+                       (default is typically /etc/dhcpd.conf)]),
+       AC_DEFINE_UNQUOTED([_PATH_DHCPD_CONF], ["$withval"],
+                          [Default file containing dhcpd configuration.]))
+
 # Allow specification of alternate state files
 AC_ARG_WITH(srv-lease-file,
        AC_HELP_STRING([--with-srv-lease-file=PATH],

diff --git a/includes/config.h.in b/includes/config.h.in
index fcb5ae305749c3075cf5265dcc794a265d6bf4a6..1635f437ec6b36464ece28586837e0bd986ec78f 100644 (file)
--- a/includes/config.h.in
+++ b/includes/config.h.in
@@ -224,6 +224,9 @@
 /* File for dhcpd6 process information. */
 #undef _PATH_DHCPD6_PID
 
+/* Default file containing dhcpd configuration. */
+#undef _PATH_DHCPD_CONF
+
 /* File for dhcpd leases. */
 #undef _PATH_DHCPD_DB