From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 13 Feb 2018 23:19:42 +0000 (+0100)
Subject: start: s/||/&&/ when mapping ids
X-Git-Tag: lxc-3.0.0.beta1~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df3c5314d2421da286fca412ae072795f0979bae;p=thirdparty%2Flxc.git

start: s/||/&&/ when mapping ids

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/start.c b/src/lxc/start.c
index f9befb827..b90d5ea00 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1559,7 +1559,7 @@ static int lxc_spawn(struct lxc_handler *handler)
 	 * again.
 	 */
 	if (wants_to_map_ids) {
-		if (!handler->conf->ns_share[LXC_NS_USER] ||
+		if (!handler->conf->ns_share[LXC_NS_USER] &&
 		    (handler->conf->ns_keep & CLONE_NEWUSER) == 0) {
 			ret = lxc_map_ids(id_map, handler->pid);
 			if (ret < 0) {