From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Sep 2015 23:22:46 +0000 (+0200)
Subject: nspawn: also close uid shift socket in the parent
X-Git-Tag: v226~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1195%2Fhead;p=thirdparty%2Fsystemd.git

nspawn: also close uid shift socket in the parent

We should really close all parent sides of our child/parent socket
pairs.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ad383e876cc..33943a4b2f0 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3359,6 +3359,7 @@ int main(int argc, char *argv[]) {
                 kmsg_socket_pair[1] = safe_close(kmsg_socket_pair[1]);
                 rtnl_socket_pair[1] = safe_close(rtnl_socket_pair[1]);
                 pid_socket_pair[1] = safe_close(pid_socket_pair[1]);
+                uid_shift_socket_pair[1] = safe_close(uid_shift_socket_pair[1]);
 
                 /* Wait for the outer child. */
                 r = wait_for_terminate_and_warn("namespace helper", pid, NULL);