src/patches/dhcp-4.2.0-paths.patch

   1 diff -up dhcp-4.2.0/includes/dhcpd.h.paths dhcp-4.2.0/includes/dhcpd.h
   2 --- dhcp-4.2.0/includes/dhcpd.h.paths   2010-07-21 13:55:42.000000000 +0200
   3 +++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 14:29:57.000000000 +0200
   4 @@ -1390,15 +1390,15 @@ typedef unsigned char option_mask [16];
   5  #else /* !DEBUG */
   6
   7  #ifndef _PATH_DHCPD_CONF
   8 -#define _PATH_DHCPD_CONF       "/etc/dhcpd.conf"
   9 +#define _PATH_DHCPD_CONF       "/etc/dhcp/dhcpd.conf"
  10  #endif /* DEBUG */
  11
  12  #ifndef _PATH_DHCPD_DB
  13 -#define _PATH_DHCPD_DB         LOCALSTATEDIR"/db/dhcpd.leases"
  14 +#define _PATH_DHCPD_DB         LOCALSTATEDIR"/dhcpd/dhcpd.leases"
  15  #endif
  16
  17  #ifndef _PATH_DHCPD6_DB
  18 -#define _PATH_DHCPD6_DB                LOCALSTATEDIR"/db/dhcpd6.leases"
  19 +#define _PATH_DHCPD6_DB                LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
  20  #endif
  21
  22  #ifndef _PATH_DHCPD_PID
  23 @@ -1412,7 +1412,7 @@ typedef unsigned char option_mask [16];
  24  #endif /* DEBUG */
  25
  26  #ifndef _PATH_DHCLIENT_CONF
  27 -#define _PATH_DHCLIENT_CONF    "/etc/dhclient.conf"
  28 +#define _PATH_DHCLIENT_CONF    "/etc/dhcp/dhclient.conf"
  29  #endif
  30
  31  #ifndef _PATH_DHCLIENT_SCRIPT
  32 @@ -1428,11 +1428,11 @@ typedef unsigned char option_mask [16];
  33  #endif
  34
  35  #ifndef _PATH_DHCLIENT_DB
  36 -#define _PATH_DHCLIENT_DB      LOCALSTATEDIR"/db/dhclient.leases"
  37 +#define _PATH_DHCLIENT_DB      LOCALSTATEDIR"/dhclient/dhclient.leases"
  38  #endif
  39
  40  #ifndef _PATH_DHCLIENT6_DB
  41 -#define _PATH_DHCLIENT6_DB     LOCALSTATEDIR"/db/dhclient6.leases"
  42 +#define _PATH_DHCLIENT6_DB     LOCALSTATEDIR"/dhclient/dhclient6.leases"
  43  #endif
  44
  45  #ifndef _PATH_RESOLV_CONF