55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
|
diff -urp dhcp-4.1.0p1.orig/client/dhclient.c dhcp-4.1.0p1/client/dhclient.c
|
||
|
|
--- dhcp-4.1.0p1.orig/client/dhclient.c 2009-08-15 11:44:33.000000000 -0400
|
||
|
|
+++ dhcp-4.1.0p1/client/dhclient.c 2009-08-15 12:32:52.000000000 -0400
|
||
|
|
@@ -37,6 +37,9 @@
|
||
|
|
#include <sys/time.h>
|
||
|
|
#include <sys/wait.h>
|
||
|
|
#include <limits.h>
|
||
|
|
+#ifdef HAVE_LIBCAP_NG
|
||
|
|
+#include <cap-ng.h>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
|
||
|
|
@@ -422,6 +425,15 @@ main(int argc, char **argv) {
|
||
|
|
path_dhclient_script = s;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifdef HAVE_LIBCAP_NG
|
||
|
|
+ /* Drop capabilities */
|
||
|
|
+ capng_clear(CAPNG_SELECT_BOTH);
|
||
|
|
+ capng_updatev(CAPNG_ADD,
|
||
|
|
+ CAPNG_EFFECTIVE|CAPNG_PERMITTED|CAPNG_BOUNDING_SET,
|
||
|
|
+ CAP_NET_ADMIN, CAP_NET_RAW, CAP_NET_BIND_SERVICE, -1);
|
||
|
|
+ capng_apply(CAPNG_SELECT_BOTH);
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
/* Set up the initial dhcp option universe. */
|
||
|
|
initialize_common_option_spaces();
|
||
|
|
|
||
|
|
diff -urp dhcp-4.1.0p1.orig/client/Makefile.am dhcp-4.1.0p1/client/Makefile.am
|
||
|
|
--- dhcp-4.1.0p1.orig/client/Makefile.am 2009-08-15 11:44:33.000000000 -0400
|
||
|
|
+++ dhcp-4.1.0p1/client/Makefile.am 2009-08-15 12:32:34.000000000 -0400
|
||
|
|
@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
|
||
|
|
scripts/netbsd scripts/nextstep scripts/openbsd \
|
||
|
|
scripts/solaris scripts/openwrt
|
||
|
|
dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \
|
||
|
|
- ../omapip/libomapi.a ../dst/libdst.a
|
||
|
|
+ ../omapip/libomapi.a ../dst/libdst.a $(CAPNG_LDADD)
|
||
|
|
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
|
||
|
|
EXTRA_DIST = $(man_MANS)
|
||
|
|
|
||
|
|
diff -urp dhcp-4.1.0p1.orig/configure.ac dhcp-4.1.0p1/configure.ac
|
||
|
|
--- dhcp-4.1.0p1.orig/configure.ac 2009-08-15 11:44:33.000000000 -0400
|
||
|
|
+++ dhcp-4.1.0p1/configure.ac 2009-08-15 12:32:34.000000000 -0400
|
||
|
|
@@ -388,6 +388,9 @@ AC_TRY_LINK(
|
||
|
|
# Look for optional headers.
|
||
|
|
AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
|
||
|
|
|
||
|
|
+# look for capabilities library
|
||
|
|
+LIBCAP_NG_PATH
|
||
|
|
+
|
||
|
|
# find an MD5 library
|
||
|
|
AC_SEARCH_LIBS(MD5_Init, [crypto])
|
||
|
|
AC_SEARCH_LIBS(MD5Init, [crypto])
|