mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
ed14f324dd
security risk by writing 8 bytes to a 4 byte declared variable. The first fix introduced a potential security problem. PR: ports/97681 Submitted by: maintainer, Dan Lukes <dan_at_obluda.cz> (an initial patch)
63 lines
1.1 KiB
C
63 lines
1.1 KiB
C
--- 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 */
|