From: Karel Zak <kzak@redhat.com>
Date: Fri, 10 Nov 2017 13:02:51 +0000 (+0100)
Subject: nsenter: revert changes committed by accident
X-Git-Tag: v2.32-rc1~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82524a1379c02bff0d061ffffae7398543218d33;p=thirdparty%2Futil-linux.git

nsenter: revert changes committed by accident

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

diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 464f9f98c7..9c452c1d14 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -238,7 +238,6 @@ int main(int argc, char *argv[])
 	int do_fork = -1; /* unknown yet */
 	uid_t uid = 0;
 	gid_t gid = 0;
-	const char *rd_path = NULL, *wd_path = NULL;
 #ifdef HAVE_LIBSELINUX
 	bool selinux = 0;
 #endif
@@ -319,13 +318,13 @@ int main(int argc, char *argv[])
 			break;
 		case 'r':
 			if (optarg)
-				rd_path = optarg;
+				open_target_fd(&root_fd, "root", optarg);
 			else
 				do_rd = true;
 			break;
 		case 'w':
 			if (optarg)
-				wd_path = optarg;
+				open_target_fd(&wd_fd, "cwd", optarg);
 			else
 				do_wd = true;
 			break;
@@ -434,11 +433,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (wd_path)
-		open_target_fd(&wd_fd, "cwd", wd_path);
-	if (rd_path)
-		open_target_fd(&root_fd, "root", rd_path);
-
 	/* Remember the current working directory if I'm not changing it */
 	if (root_fd >= 0 && wd_fd < 0) {
 		wd_fd = open(".", O_RDONLY);