nsenter: keep semantic consistent

The current nseneter behavior is inconsistent and depends on way how
namespace is specified on command line

    # nsenter --user
vs.
    # nseneter --user=filename

if the namespace is specified by <filename> than nsenter does not do
additinal setting and actions (e.g. does not call setgroups, setuid).
This is bug.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index e00a3e47273b9db4dc6d7e3e694e125a1f018faf..50f77f3819d1d792d6622a0d8566cd9aae05f9b4 100644 (file)
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -283,6 +283,15 @@ int main(int argc, char *argv[])
        if (do_wd)
                open_target_fd(&wd_fd, "cwd", NULL);
 
+       /*
+        * Update namespaces variable to contain all requested namespaces
+        */
+       for (nsfile = namespace_files; nsfile->nstype; nsfile++) {
+               if (nsfile->fd < 0)
+                       continue;
+               namespaces |= nsfile->nstype;
+       }
+
        /*
         * Now that we know which namespaces we want to enter, enter them.
         */