[git commit] setpriv: remove dependency on libcap headers

Denys Vlasenko vda.linux at googlemail.com
Fri Jul 7 15:59:40 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=b0c0b6d5ba4b15069a1e4ce6750c0ef2e93579e1
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/setpriv.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 3a7e680..3d8dfea 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -81,7 +81,14 @@
 
 #if ENABLE_FEATURE_SETPRIV_CAPABILITIES
 #include <linux/capability.h>
-#include <sys/capability.h>
+// #include <sys/capability.h>
+// This header is in libcap, but the functions are in libc.
+// Comment in the header says this above capset/capget:
+/* system calls - look to libc for function to system call mapping */
+extern int capset(cap_user_header_t header, cap_user_data_t data);
+extern int capget(cap_user_header_t header, const cap_user_data_t data);
+// so for bbox, let's just repeat the declarations.
+// This way, libcap needs not be installed in build environment.
 #endif
 #include <sys/prctl.h>
 #include "libbb.h"


More information about the busybox-cvs mailing list