summaryrefslogtreecommitdiff
blob: 991bf25afb54c9e1518e6d56855db76df3a25f1a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
diff -ruN dhcdbd-1.14.orig/dhcdbd.c dhcdbd-1.14/dhcdbd.c
--- dhcdbd-1.14.orig/dhcdbd.c	2006-05-05 11:25:35.000000000 -0500
+++ dhcdbd-1.14/dhcdbd.c	2006-05-05 11:28:06.000000000 -0500
@@ -837,9 +837,8 @@
     {
 	dhcdbd_debug("Running dhclient for IF_UP %s",d_if->name);
 
-	snprintf(dhc_if_conf_file, 1024, "%s%s%s%s", 
-		 DHCDBD_DHCLIENT_CONF_PFX,DHCDBD_DHCLIENT_CONF_SEP,
-		 d_if->name, DHCDBD_DHCLIENT_CONF_SFX
+	snprintf(dhc_if_conf_file, 1024, "%s%s", 
+		 DHCDBD_DHCLIENT_CONF_PFX, DHCDBD_DHCLIENT_CONF_SFX
 	        );
 	
 	if( access( dhc_if_conf_file, R_OK ) == 0 )
diff -ruN dhcdbd-1.14.orig/dhcdbd.h dhcdbd-1.14/dhcdbd.h
--- dhcdbd-1.14.orig/dhcdbd.h	2006-05-05 11:25:35.000000000 -0500
+++ dhcdbd-1.14/dhcdbd.h	2006-05-05 11:27:33.000000000 -0500
@@ -49,11 +49,11 @@
 #define DHCDBD_DHCLIENT_PID_SFX   ".pid"
 #endif
 #ifndef DHCDBD_DHCLIENT_CONF_PFX
-#define DHCDBD_DHCLIENT_CONF_PFX  "/etc/dhclient"
+#define DHCDBD_DHCLIENT_CONF_PFX  "/etc/dhcp/dhclient"
 #endif
-#ifndef DHCDBD_DHCLIENT_CONF_SEP
+/* #ifndef DHCDBD_DHCLIENT_CONF_SEP
 #define DHCDBD_DHCLIENT_CONF_SEP  "-"
-#endif
+#endif */
 #ifndef DHCDBD_DHCLIENT_CONF_SFX
 #define DHCDBD_DHCLIENT_CONF_SFX  ".conf"
 #endif