From: Karel Zak <kzak@redhat.com>
Date: Tue, 4 Dec 2012 13:32:15 +0000 (+0100)
Subject: vipw: remove unused set{uid,gid} calls
X-Git-Tag: v2.23-rc1~456
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccb07d4d4fa87b63f280bb0dcbcd57d1a8d745ce;p=thirdparty%2Futil-linux.git

vipw: remove unused set{uid,gid} calls

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

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index 1eeeb0dd7c..152c9f5aa3 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -192,7 +192,7 @@ static void pw_write(void)
 	free(tmp_file);
 }
 
-static void pw_edit(int notsetuid)
+static void pw_edit(void)
 {
 	int pstat;
 	pid_t pid;
@@ -212,10 +212,6 @@ static void pw_edit(int notsetuid)
 		err(EXIT_FAILURE, _("fork failed"));
 
 	if (!pid) {
-		if (notsetuid) {
-			(void)setgid(getgid());
-			(void)setuid(getuid());
-		}
 		execlp(editor, p, tmp_file, NULL);
 		/* Shouldn't get here */
 		_exit(EXIT_FAILURE);
@@ -271,7 +267,7 @@ static void edit_file(int is_shadow)
 	if (fstat(fileno(tmp_fd), &begin))
 		pw_error(tmp_file, 1, 1);
 
-	pw_edit(0);
+	pw_edit();
 
 	if (fstat(fileno(tmp_fd), &end))
 		pw_error(tmp_file, 1, 1);