Override default value for _PATH_DHCRELAY_PID

diff --git a/includes/cf/cygwin32.h b/includes/cf/cygwin32.h
index f06c359ba10f9e9e0138690864ae5826dcedb1d6..d9ccfaa6af0b5b47bda15897cce39d7e1e8085d7 100644 (file)
--- a/includes/cf/cygwin32.h
+++ b/includes/cf/cygwin32.h
@@ -91,6 +91,9 @@
 #ifndef _PATH_DHCLIENT_CONF
 #define _PATH_DHCLIENT_CONF "//e/etc/dhclient.conf"
 #endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "//e/etc/dhcrelay.pid"
+#endif
 
 #ifndef _PATH_RESOLV_CONF
 #define _PATH_RESOLV_CONF "//e/etc/resolv.conf"

diff --git a/includes/cf/hpux.h b/includes/cf/hpux.h
index 9c42152f62304837789c2b7fa65a06c3193d49f6..7271931fa6dd367d8f7df4053646dc08472d3ccb 100644 (file)
--- a/includes/cf/hpux.h
+++ b/includes/cf/hpux.h
@@ -59,7 +59,10 @@ extern int h_errno;
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
 #endif
 #ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhcpd.pid"
+#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
+#endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
 #endif
 
 #include <varargs.h>

diff --git a/includes/cf/nextstep.h b/includes/cf/nextstep.h
index de39a230ad17bf1a06f8c74253051a3c711697ee..c1e88e1d205bfbe4ebb852f0f1b6690faba0ac18 100644 (file)
--- a/includes/cf/nextstep.h
+++ b/includes/cf/nextstep.h
@@ -70,6 +70,7 @@ extern int h_errno;
 #endif
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
 #define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
+#define _PATH_DHCLIENT_PID "/etc/dhcrelay.pid"
 /* Stdarg definitions for ANSI-compliant C compilers. */
 #import <stdarg.h>
 #define VA_DOTDOTDOT ...

diff --git a/includes/cf/qnx.h b/includes/cf/qnx.h
index 55956a9619f5be7eb7aceafb9a6278aa559e25da..0e78582dc449187375a21f2047364b2f16832dc8 100644 (file)
--- a/includes/cf/qnx.h
+++ b/includes/cf/qnx.h
@@ -67,6 +67,9 @@ extern int h_errno;
 #ifndef _PATH_DHCLIENT_PID
 #define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
 #endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
+#endif
 
 #define EOL    '\n'
 #define VOIDPTR void *

diff --git a/includes/cf/sample.h b/includes/cf/sample.h
index e6f668e349da57aea407734b0d965d3b50c375b6..892303b977e218b09adddf9e3488c59609e78357 100644 (file)
--- a/includes/cf/sample.h
+++ b/includes/cf/sample.h
@@ -129,6 +129,9 @@ extern int h_errno;
 #ifndef _PATH_DHCLIENT_PID
 #define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
 #endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
+#endif
 
 /* Porting::
 

diff --git a/includes/cf/sco.h b/includes/cf/sco.h
index 2d6ae1d0fd86c4b09ed7bad20794eb2dc9f2f0b5..e8be09037615ade30d659fbb03ac0499245e18da 100644 (file)
--- a/includes/cf/sco.h
+++ b/includes/cf/sco.h
@@ -77,7 +77,10 @@ extern int h_errno;
 #define _PATH_DHCPD_PID        "/etc/dhcpd.pid"
 #endif
 #ifndef _PATH_DHCLIENT_PID
-#define _PATH_DHCLIENT_PID "/etc/dhcpd.pid"
+#define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
+#endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
 #endif
 
 #define INADDR_LOOPBACK        ((u_int32_t)0x7f000001)

diff --git a/includes/cf/sunos4.h b/includes/cf/sunos4.h
index 610034e64df1136b7416681d3530e4c6cba82630..55d98e4d7d4e9856e9642dbb54f956283e77ae6f 100644 (file)
--- a/includes/cf/sunos4.h
+++ b/includes/cf/sunos4.h
@@ -99,6 +99,9 @@ extern int h_errno;
 #ifndef _PATH_DHCLIENT_PID
 #define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
 #endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
+#endif
 
 #ifdef __GNUC__
 /* Varargs stuff: use stdarg.h instead ... */

diff --git a/includes/cf/sunos5-5.h b/includes/cf/sunos5-5.h
index fc871f6146f9174d88c5aad9934807acf5daa9e3..435a9e36242698b788bcef90cc8c5bb151cd2d7c 100644 (file)
--- a/includes/cf/sunos5-5.h
+++ b/includes/cf/sunos5-5.h
@@ -87,6 +87,9 @@ extern int h_errno;
 #ifndef _PATH_DHCLIENT_PID
 #define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
 #endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
+#endif
 
 #if defined (__GNUC__) || defined (__SVR4)
 /* Varargs stuff: use stdarg.h instead ... */

diff --git a/includes/cf/ultrix.h b/includes/cf/ultrix.h
index 1f1fbbcbb1962ecb085d322b73eb309194e9089e..da7c35c6c1acb0f1f11a4502cbaa41ae410f60d7 100644 (file)
--- a/includes/cf/ultrix.h
+++ b/includes/cf/ultrix.h
@@ -58,6 +58,9 @@ extern int h_errno;
 #ifndef _PATH_DHCLIENT_PID
 #define _PATH_DHCLIENT_PID "/etc/dhclient.pid"
 #endif
+#ifndef _PATH_DHCRELAY_PID
+#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid"
+#endif
 
 #define int8_t         char
 #define int16_t                short