5a3797e
diff -up dhcp-4.2.0/includes/dhcpd.h.paths dhcp-4.2.0/includes/dhcpd.h
5a3797e
--- dhcp-4.2.0/includes/dhcpd.h.paths	2010-07-21 13:55:42.000000000 +0200
5a3797e
+++ dhcp-4.2.0/includes/dhcpd.h	2010-07-21 14:29:57.000000000 +0200
5a3797e
@@ -1390,15 +1390,15 @@ typedef unsigned char option_mask [16];
bd47089
 #else /* !DEBUG */
bd47089
 
bd47089
 #ifndef _PATH_DHCPD_CONF
bd47089
-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
bd47089
+#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
82186fd
 #endif /* DEBUG */
82186fd
 
82186fd
 #ifndef _PATH_DHCPD_DB
82186fd
-#define _PATH_DHCPD_DB		LOCALSTATEDIR"/db/dhcpd.leases"
82186fd
+#define _PATH_DHCPD_DB		LOCALSTATEDIR"/dhcpd/dhcpd.leases"
82186fd
 #endif
82186fd
 
82186fd
 #ifndef _PATH_DHCPD6_DB
82186fd
-#define _PATH_DHCPD6_DB		LOCALSTATEDIR"/db/dhcpd6.leases"
82186fd
+#define _PATH_DHCPD6_DB		LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
82186fd
 #endif
82186fd
 
82186fd
 #ifndef _PATH_DHCPD_PID
5a3797e
@@ -1412,7 +1412,7 @@ typedef unsigned char option_mask [16];
bd47089
 #endif /* DEBUG */
bd47089
 
bd47089
 #ifndef _PATH_DHCLIENT_CONF
bd47089
-#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
bd47089
+#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
bd47089
 #endif
bd47089
 
bd47089
 #ifndef _PATH_DHCLIENT_SCRIPT
5a3797e
@@ -1428,11 +1428,11 @@ typedef unsigned char option_mask [16];
82186fd
 #endif
82186fd
 
82186fd
 #ifndef _PATH_DHCLIENT_DB
82186fd
-#define _PATH_DHCLIENT_DB	LOCALSTATEDIR"/db/dhclient.leases"
82186fd
+#define _PATH_DHCLIENT_DB	LOCALSTATEDIR"/dhclient/dhclient.leases"
82186fd
 #endif
82186fd
 
82186fd
 #ifndef _PATH_DHCLIENT6_DB
82186fd
-#define _PATH_DHCLIENT6_DB	LOCALSTATEDIR"/db/dhclient6.leases"
82186fd
+#define _PATH_DHCLIENT6_DB	LOCALSTATEDIR"/dhclient/dhclient6.leases"
82186fd
 #endif
82186fd
 
82186fd
 #ifndef _PATH_RESOLV_CONF