The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1571
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Do not call idmaptool_on_path_and_privileged with CAP_SETUID and CAP_SETGID if HAVE_LIBCAP is not defined otherwise compilation fails Signed-off-by: Fabrice Fontaine <[email protected]>
From adeb1340db1633e8cc53955d1036db4c0b55272f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Wed, 17 May 2017 22:20:59 +0200 Subject: [PATCH] Fix build of conf.c when capabilities is disabled Do not call idmaptool_on_path_and_privileged with CAP_SETUID and CAP_SETGID if HAVE_LIBCAP is not defined otherwise compilation fails Signed-off-by: Fabrice Fontaine <[email protected]> --- src/lxc/conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index a66d9e7..8f55578 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -3469,8 +3469,10 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid) * will protected it by preventing another user from being handed the * range by shadow. */ + #if HAVE_LIBCAP uidmap = idmaptool_on_path_and_privileged("newuidmap", CAP_SETUID); gidmap = idmaptool_on_path_and_privileged("newgidmap", CAP_SETGID); + #endif if (uidmap > 0 && gidmap > 0) { DEBUG("Functional newuidmap and newgidmap binary found."); use_shadow = true;
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
