- ./configure now autodetects local database locations rather than trying

  to put dhcpd.leases and dhclient.leases in /usr/local/var/db, which no
  one ever has.  [ISC-Bugs #17268]

diff --git a/RELNOTES b/RELNOTES
index 311154db1e0fe1f1d6d2b0b6233eafd3fa451e4b..dd71a851c3a1f03bf01b64e258a89b631827bcdd 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -90,6 +90,10 @@ suggested fixes to <dhcp-users@isc.org>.
 
 - A reference overleak in DHCPv6 shared network processing was repaired.
 
+- ./configure now autodetects local database locations rather than trying
+  to put dhcpd.leases and dhclient.leases in /usr/local/var/db, which no
+  one ever has.
+
                        Changes since 4.0.0b2
 
 - Clarified error message when lease limit exceeded

diff --git a/configure.ac b/configure.ac
index fa7199d8340430f1cee9b3be55e56200a212e5d2..030eeacd1c9fb350b2d85daec09afa6a8b2217b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,25 @@ if test "$enable_dhcpv6" != "no"; then
                  [Define to 1 to include DHCPv6 support.])
 fi
 
+###
+### Path fun.  Older versions of DHCP were installed in /usr/sbin, so we
+### need to look there and potentially overwrite by default (but not if
+### the user configures an alternate value).  LOCALSTATEDIR is totally
+### braindead.  No one uses /usr/local/var/db/ nor /usr/local/var/run, and
+### they would be insane for suggesting it.  We need to look in /var/for
+### 'db' and 'state/dhcp' for db files, and /var/run for pid files by
+### default.
+###
+AC_PREFIX_PROGRAM(dhcpd)
+
+# XXX - isn't there SOME WAY to default autoconf to /var instead of
+# /usr/local/var/no/one/has/this/please/stop/trying?
+case "$localstatedir" in
+       '${prefix}/var')
+               localstatedir=/var
+               ;;
+esac
+
 # Allow specification of alternate state files
 AC_ARG_WITH(srv-lease-file,
        AC_HELP_STRING([--with-srv-lease-file=PATH],
@@ -46,12 +65,62 @@ AC_ARG_WITH(srv-lease-file,
                        (default is LOCALSTATEDIR/db/dhcpd.leases)]),
        AC_DEFINE_UNQUOTED([_PATH_DHCPD_DB], ["$withval"],
                           [File for dhcpd leases.]))
+
+echo -n "checking for dhcpd.leases location..."
+if [[ "x$with_srv_lease_file" = "x" ]] ; then
+       if [[ -d "${localstatedir}/db" ]] ; then
+               with_srv_lease_file="${localstatedir}/db/dhcpd.leases"
+       elif [[ -d "${localstatedir}/state" ]] ; then
+               if [[ -d "${localstatedir}/state/dhcp" ]] ; then
+                       with_srv_lease_file="${localstatedir}/state/dhcp/dhcpd.leases"
+               else
+                       with_srv_lease_file="${localstatedir}/state/dhcpd.leases"
+               fi
+       elif [[ -d "${localstatedir}/lib" ]] ; then
+               if [[ -d "${localstatedir}/lib/dhcp" ]] ; then
+                       with_srv_lease_file="${localstatedir}/lib/dhcp/dhcpd.leases"
+               else
+                       with_srv_lease_file="${localstatedir}/lib/dhcpd.leases"
+               fi
+       elif [[ -d "${localstatedir}/etc" ]] ; then
+               with_srv_lease_file="${localstatedir}/etc/dhcpd.leases"
+       else
+               with_srv_lease_file="/etc/dhcpd.leases"
+       fi
+fi
+echo "$with_srv_lease_file"
+
 AC_ARG_WITH(cli-lease-file,
        AC_HELP_STRING([--with-cli-lease-file=PATH],
                       [File for dhclient leases 
                        (default is LOCALSTATEDIR/db/dhclient.leases)]),
        AC_DEFINE_UNQUOTED([_PATH_DHCLIENT_DB], ["$withval"],
                           [File for dhclient leases.]))
+
+echo -n "checking for dhclient.leases location..."
+if [[ "x$with_cli_lease_file" = "x" ]] ; then
+       if [[ -d "${localstatedir}/db" ]] ; then
+               with_cli_lease_file="${localstatedir}/db/dhclient.leases"
+       elif [[ -d "${localstatedir}/state" ]] ; then
+               if [[ -d "${localstatedir}/state/dhcp" ]] ; then
+                       with_cli_lease_file="${localstatedir}/state/dhcp/dhclient.leases"
+               else
+                       with_cli_lease_file="${localstatedir}/state/dhclient.leases"
+               fi
+       elif [[ -d "${localstatedir}/lib" ]] ; then
+               if [[ -d "${localstatedir}/lib/dhcp" ]] ; then
+                       with_cli_lease_file="${localstatedir}/lib/dhcp/dhclient.leases"
+               else
+                       with_cli_lease_file="${localstatedir}/lib/dhclient.leases"
+               fi
+       elif [[ -d "${localstatedir}/etc" ]] ; then
+               with_cli_lease_file="${localstatedir}/etc/dhclient.leases"
+       else
+               with_cli_lease_file="/etc/dhclient.leases"
+       fi
+fi
+echo "$with_cli_lease_file"
+
 AC_ARG_WITH(srv-pid-file,
        AC_HELP_STRING([--with-srv-pid-file=PATH],
                       [File for dhcpd process information