Fix return value of userns_exec_1

Instead of always returning -1 and call SYSERROR when the child returns non-zero. Have userns_exec_1 always return the return value from the function it's calling and let the caller do the error handling (as is already done by its only caller). Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Fix return value of userns_exec_1
3139aead · Stéphane Graber · 275a2d0b · 3139aead
Commit 3139aead authored Jan 14, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

conf.c src/lxc/conf.c +5 -4

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4054,10 +4054,11 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data)
 		goto err;
 	}
-	if ((ret = wait_for_pid(pid)) < 0) {
+	ret = wait_for_pid(pid);
-		ERROR("Child returned an error: %d\n", ret);
-		goto err;
+	close(p[1]);
-	}
+	return ret;
 err:
 	if (p[0] != -1)
 		close(p[0]);