- markus@cvs.openbsd.org 2001/03/19 17:07:23

     [auth.c readconf.c]
     undo /etc/shell and proto 2,1 change for openssh-2.5.2

1 files changed, 2 insertions, 11 deletions

diff --git a/auth.c b/auth.c
index 14e7f7e7..1f976eee 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.20 2001/03/17 17:27:59 markus Exp $");
+RCSID("$OpenBSD: auth.c,v 1.21 2001/03/19 17:07:23 markus Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -57,7 +57,7 @@ int
 allowed_user(struct passwd * pw)
 {
 	struct stat st;
-	char *shell, *cp;
+	char *shell;
 	int i;
 #ifdef WITH_AIXAUTHENTICATE
 	char *loginmsg;
@@ -95,15 +95,6 @@ allowed_user(struct passwd * pw)
 	 */
 	shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell;
 
-	/* disallow anyone who does not have a standard shell */
-	setusershell();
-	while ((cp = getusershell()) != NULL)
-		if (strcmp(cp, shell) == 0)
-			break;
-	endusershell();
-	if (cp == NULL)
-		return 0;
-
 	/* deny if shell does not exists or is not executable */
 	if (stat(shell, &st) != 0)
 		return 0;