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

  Merged 'rt44765'.

diff --git a/RELNOTES b/RELNOTES
index 4b7ccc0eae0e519edd27316d34eff49273995345..115a44a9ac751dd6beacf6b8fde6fc4fccc7ac93 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -129,6 +129,10 @@ by Eric Young (eay@cryptsoft.com).
   includes/site.h. This flag is undefined by default.
   [ISC-Bugs #43927]
 
+- 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.3.0 (bug fixes)
 
 - Tidy up several small tickets.

diff --git a/configure b/configure
index eff92d161cacf23ac9d8899eea62453c05916993..9620b1ac4c4b258d7a2614175383f27583b4678f 100755 (executable)
--- a/configure
+++ b/configure
@@ -776,6 +776,7 @@ enable_secs_byteorder
 enable_log_pid
 enable_binary_leases
 with_atf
+with_srv_conf_file
 with_srv_lease_file
 with_srv6_lease_file
 with_cli_lease_file
@@ -1468,6 +1469,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 (or "bind")
+  --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)
@@ -5826,6 +5830,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 b4d5bc3fd521164913f0eb673862c369d2148c3c..6162d261faf7a01e138914c9fd1c32f95dfb80c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -340,6 +340,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,
        AS_HELP_STRING([--with-srv-lease-file=PATH],[File for dhcpd leases

diff --git a/configure.ac+lt b/configure.ac+lt
index b1edb6dabeb4f5d98e9a2096fcd3f1713471dafb..742207a1c23de6a018cd2b7a3445adb986b652d0 100644 (file)
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -341,6 +341,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,
        AS_HELP_STRING([--with-srv-lease-file=PATH],[File for dhcpd leases

diff --git a/configure.ac-base b/configure.ac-base
index 6bd236cebe60da4b7524e0d9d18e1ea972fd3dca..284011e670fcce29531ea39c4e581560f4d9a29f 100644 (file)
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -346,6 +346,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,
        AS_HELP_STRING([--with-srv-lease-file=PATH],[File for dhcpd leases

diff --git a/configure.ac-lt b/configure.ac-lt
index 302271de42331db2b2b0770bd19575e2bb31e60c..ba0a8920c38e2bcc3b2322abc3dbc545a40210d7 100644 (file)
--- a/configure.ac-lt
+++ b/configure.ac-lt
@@ -340,6 +340,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,
        AS_HELP_STRING([--with-srv-lease-file=PATH],[File for dhcpd leases

diff --git a/includes/config.h.in b/includes/config.h.in
index 02f5dbcfec70699cd9cac78d6502069f53b65b41..4a3330d89f7be8bce8e1d4a041ecd314547aa6a2 100644 (file)
--- a/includes/config.h.in
+++ b/includes/config.h.in
@@ -242,6 +242,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