From: Karel Zak <kzak@redhat.com>
Date: Fri, 30 Jul 2021 12:16:03 +0000 (+0200)
Subject: Revert "sulogin: fix getpasswd()"
X-Git-Tag: v2.38-rc1~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc37e883ee5dbe59a89b925e06f3a92d54cbb29;p=thirdparty%2Futil-linux.git

Revert "sulogin: fix getpasswd()"

This patch is unnecessary in the master branch.

This reverts commit 2d8a9fcee2e3d63deb6bcba650894ff14d8e2d3b.

References: https://github.com/karelzak/util-linux/issues/1400
---

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 8f47fe31d8..0559eebc5f 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -680,7 +680,6 @@ static char *getpasswd(struct console *con)
 	tc = 0;
 	ret = pass;
 
-	ret = pass;
 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);