From: Ted Lemon <source@isc.org>
Date: Sat, 22 Nov 1997 07:52:43 +0000 (+0000)
Subject: Override default value for _PATH_DHCRELAY_PID
X-Git-Tag: DHCP-971122~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=095a79940deb0c2fefc60b8663adb77326985b2d;p=thirdparty%2Fdhcp.git

Override default value for _PATH_DHCRELAY_PID
---

diff --git a/includes/cf/cygwin32.h b/includes/cf/cygwin32.h
index f06c359ba..d9ccfaa6a 100644
--- 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 9c42152f6..7271931fa 100644
--- 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 de39a230a..c1e88e1d2 100644
--- 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 55956a961..0e78582dc 100644
--- 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 e6f668e34..892303b97 100644
--- 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 2d6ae1d0f..e8be09037 100644
--- 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 610034e64..55d98e4d7 100644
--- 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 fc871f614..435a9e362 100644
--- 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 1f1fbbcbb..da7c35c6c 100644
--- 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