lib/, src/, doc/: Remove pw_auth()'s as dead code

We don't read the parameter at all. Remove it. As a consequence, all the PW_* constants are also removed (as they are now unused). Signed-off-by: Alejandro Colomar <[email protected]>
shadow-maint · Jan 30, 2025 · 17e7da6 · 17e7da6
1 parent 5064c6b
commit 17e7da6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 34 deletions.
diff --git a/doc/HOWTO b/doc/HOWTO
@@ -1751,7 +1751,7 @@
       }
   #ifdef HAS_SHADOW
       if ((pw->pw_passwd && pw->pw_passwd[0] == '@'
-           && pw_auth (pw->pw_passwd+1, pw->pw_name, PW_LOGIN))
+           && pw_auth(pw->pw_passwd+1, pw->pw_name))
           || !valid (passwd, pw)) {
           return (UPAP_AUTHNAK);
       }

diff --git a/lib/pwauth.c b/lib/pwauth.c
@@ -48,9 +48,8 @@ static const char *PROMPT = gettext_noop ("%s's Password: ");
  *	compared.
  */
 
-int pw_auth (const char *cipher,
-             const char *user,
-             int reason)
+int
+pw_auth(const char *cipher, const char *user)
 {
 	int          retval;
 	char         prompt[1024];

diff --git a/lib/pwauth.h b/lib/pwauth.h
@@ -7,31 +7,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-/*
- *	$Id$
- */
-
 #ifndef _PWAUTH_H
 #define _PWAUTH_H
 
 #ifndef USE_PAM
-int pw_auth (const char *cipher,
-             const char *user,
-             int flag);
+int pw_auth(const char *cipher, const char *user);
 #endif				/* !USE_PAM */
 
-/*
- * Local access
- */
-
-#define	PW_SU		1
-#define	PW_LOGIN	2
-
-/*
- * Network access
- */
-
-#define	PW_TELNET	201
-#define	PW_RLOGIN	202
-
 #endif /* _PWAUTH_H */
diff --git a/lib/pwdcheck.c b/lib/pwdcheck.c
@@ -28,7 +28,7 @@ void passwd_check (const char *user, const char *passwd, MAYBE_UNUSED const char
 	if (NULL != sp) {
 		passwd = sp->sp_pwdp;
 	}
-	if (pw_auth(passwd, user, PW_LOGIN) != 0) {
+	if (pw_auth(passwd, user) != 0) {
 		SYSLOG ((LOG_WARN, "incorrect password for `%s'", user));
 		(void) sleep (1);
 		fprintf (log_get_logfd(), _("Incorrect password for %s.\n"), user);

diff --git a/src/login.c b/src/login.c
@@ -77,7 +77,6 @@ static const char Prog[] = "login";
 
 static const char *hostname = "";
 static /*@null@*/ /*@only@*/char *username = NULL;
-static int reason = PW_LOGIN;
 
 #ifndef USE_PAM
 #ifdef ENABLE_LASTLOG
@@ -289,7 +288,6 @@ static void process_flags (int argc, char *const *argv)
 		case 'h':
 			hflg = true;
 			hostname = optarg;
-			reason = PW_TELNET;
 			break;
 		case 'p':
 			pflg = true;
@@ -536,9 +534,6 @@ int main (int argc, char **argv)
 	if (fflg) {
 		preauth_flag = true;
 	}
-	if (hflg) {
-		reason = PW_RLOGIN;
-	}
 
 	OPENLOG (Prog);
 
@@ -903,7 +898,7 @@ int main (int argc, char **argv)
 			goto auth_ok;
 		}
 
-		if (pw_auth(user_passwd, username, reason) == 0) {
+		if (pw_auth(user_passwd, username) == 0) {
 			goto auth_ok;
 		}
 
@@ -964,7 +959,7 @@ int main (int argc, char **argv)
 		 * all).  --marekm
 		 */
 		if (streq(user_passwd, "")) {
-			pw_auth("!", username, reason);
+			pw_auth("!", username);
 		}
 
 		/*

diff --git a/src/su.c b/src/su.c
@@ -590,7 +590,7 @@ static void check_perms_nopam (const struct passwd *pw)
 	 * The first character of an administrator defined method is an '@'
 	 * character.
 	 */
-	if (pw_auth(password, name, PW_SU) != 0) {
+	if (pw_auth(password, name) != 0) {
 		SYSLOG (((pw->pw_uid != 0)? LOG_NOTICE : LOG_WARN,
 		         "Authentication failed for %s", name));
 		fprintf(stderr, _("%s: Authentication failure\n"), Prog);