diff options
| author | Denys Vlasenko | 2018-02-21 20:13:39 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2018-02-21 20:13:39 +0100 |
| commit | 2af5e3fac394a922bcf7752be25128879405a21a (patch) | |
| tree | 3566d0edc685776aa192686507a38411c51662c0 | |
| parent | 7d285c78a35b1e745f7c6f27e31d73677ad2943a (diff) | |
| download | busybox-2af5e3fac394a922bcf7752be25128879405a21a.zip busybox-2af5e3fac394a922bcf7752be25128879405a21a.tar.gz | |
libbb: compile capability code only if FEATURE_SETPRIV_CAPABILITIES or RUN_INIT
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 5 | ||||
| -rw-r--r-- | libbb/capability.c | 3 | ||||
| -rw-r--r-- | util-linux/switch_root.c | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h index c02621d..f1ab1ca 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1488,6 +1488,7 @@ extern void run_shell(const char *shell, int loginshell, const char **args) NORE */ const char *get_shell_name(void) FAST_FUNC; +#if ENABLE_FEATURE_SETPRIV_CAPABILITIES || ENABLE_RUN_INIT unsigned cap_name_to_number(const char *cap) FAST_FUNC; void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; void drop_capability(int cap_ordinal) FAST_FUNC; @@ -1499,9 +1500,7 @@ struct caps { \ struct __user_cap_data_struct data[2]; \ } void getcaps(void *caps) FAST_FUNC; - -unsigned cap_name_to_number(const char *name) FAST_FUNC; -void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; +#endif #if ENABLE_SELINUX extern void renew_current_security_context(void) FAST_FUNC; diff --git a/libbb/capability.c b/libbb/capability.c index f60062b..6587dcb 100644 --- a/libbb/capability.c +++ b/libbb/capability.c @@ -3,7 +3,8 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//kbuild:lib-$(CONFIG_PLATFORM_LINUX) += capability.o +//kbuild:lib-$(CONFIG_FEATURE_SETPRIV_CAPABILITIES) += capability.o +//kbuild:lib-$(CONFIG_RUN_INIT) += capability.o #include <linux/capability.h> // #include <sys/capability.h> diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index 2d1802b..947dd0c 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c @@ -39,6 +39,12 @@ #include <sys/mount.h> #if ENABLE_RUN_INIT # include <sys/prctl.h> +# ifndef PR_CAPBSET_READ +# define PR_CAPBSET_READ 23 +# endif +# ifndef PR_CAPBSET_DROP +# define PR_CAPBSET_DROP 24 +# endif # include <linux/capability.h> // #include <sys/capability.h> // This header is in libcap, but the functions are in libc. |