dhcp: Update to 4.2.4.

[people/ms/ipfire-3.x.git] / dhcp / patches / dhcp-4.2.4-paths.patch

diff --git a/dhcp/patches/dhcp-4.2.4-paths.patch b/dhcp/patches/dhcp-4.2.4-paths.patch
new file mode 100644 (file)
index 0000000..a737571
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.4-paths.patch
@@ -0,0 +1,26 @@
+diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
+--- dhcp-4.2.4b1/includes/dhcpd.h.paths        2012-04-18 11:12:34.000000000 +0200
++++ dhcp-4.2.4b1/includes/dhcpd.h      2012-04-18 11:14:38.541272405 +0200
+@@ -1420,7 +1420,7 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+ 
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF      "/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF      "/etc/dhcp/dhcpd.conf"
+ #endif /* DEBUG */
+ 
+ #ifndef _PATH_DHCPD_DB
+@@ -1442,11 +1442,11 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+ 
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF   "/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF   "/etc/dhcp/dhclient.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_SCRIPT
+-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script"
++#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_PID