diff options
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | configure.ac+lt | 7 | ||||
| -rw-r--r-- | configure.ac-base | 7 | ||||
| -rw-r--r-- | configure.ac-lt | 7 | ||||
| -rw-r--r-- | includes/config.h.in | 3 |
7 files changed, 51 insertions, 0 deletions
@@ -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. @@ -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 b4d5bc3f..6162d261 100644 --- 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 b1edb6da..742207a1 100644 --- 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 6bd236ce..284011e6 100644 --- 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 302271de..ba0a8920 100644 --- 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 02f5dbcf..4a3330d8 100644 --- 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 |