diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2008-10-13 11:10:11 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2008-10-13 11:10:11 +0000 |
| commit | ab35a768ad6e4e9b5227ceb4a517657ba7fefcc5 (patch) | |
| tree | 9741c230a5c7c1f7f6a37895edc8a6c65e8c14a9 /net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h | |
| parent | . add linux_base-fc6, linux_base-f7, linux_base-f8 to CONFLICTS; (diff) | |
Move isc-dhcp3-(server|client|relay) to isc-dhcp30-(server|client|relay)
to make space for the isc-dhcp31 and isc-dhcp40 servers of it.
Notes
Notes:
svn path=/head/; revision=221530
Diffstat (limited to 'net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h')
| -rw-r--r-- | net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h deleted file mode 100644 index 071ac6ca5a29..000000000000 --- a/net/isc-dhcp3-server/files/patch-includes::cf::freebsd.h +++ /dev/null @@ -1,62 +0,0 @@ ---- includes/cf/freebsd.h.orig Wed Sep 1 19:06:36 2004 -+++ includes/cf/freebsd.h Mon May 15 09:13:18 2006 -@@ -33,7 +33,7 @@ - */ - - #include <syslog.h> --#include <sys/types.h> -+#include <sys/param.h> - #include <string.h> - #include <paths.h> - #include <errno.h> -@@ -97,6 +97,10 @@ - #define SOCKLEN_T int - #endif - -+#ifdef RESCUE -+#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" -+#endif -+ - #if defined (USE_DEFAULT_NETWORK) - # define USE_BPF - #endif -@@ -107,6 +111,9 @@ - #endif /* HAVE_DEV_RANDOM */ - - const char *cmds[] = { -+#ifndef RESCUE -+ /* rescue environment can't rely on these ... */ -+ /* Actually, /sbin/dhclient shouldn't use these, either. */ - "/bin/ps -axlw 2>&1", - "/usr/sbin/arp -an 2>&1", - "/usr/bin/netstat -an 2>&1", -@@ -117,10 +124,12 @@ - "/usr/sbin/iostat 2>&1", - "/usr/bin/vmstat 2>&1", - "/usr/bin/w 2>&1", -+#endif - NULL - }; - - const char *dirs[] = { -+#ifndef RESCUE - "/tmp", - "/usr/tmp", - ".", -@@ -130,13 +139,16 @@ - "/var/mail", - "/home", - "/usr/home", -+#endif - NULL - }; - - const char *files[] = { -+#ifndef RESCUE - "/var/log/messages", - "/var/log/wtmp", - "/var/log/lastlog", -+#endif - NULL - }; - #endif /* NEED_PRAND_CONF */ |