openssh unix dev - Mar 2000 - [PATCH] Correction empty shell-field patch

Sorry - my previous patch was bad.  Here is the corrected one.

Cheers, Theo
-------------- next part --------------
diff -Naur openssh-1.2.3-dist/sshd.c openssh-1.2.3/sshd.c
--- openssh-1.2.3-dist/sshd.c	Fri Mar 31 23:04:10 2000
+++ openssh-1.2.3/sshd.c	Fri Mar 31 23:24:21 2000
@@ -1121,6 +1121,7 @@
 	struct stat st;
 	struct group *grp;
 	int i;
+	char*shell;
 #ifdef WITH_AIXAUTHENTICATE
 	char *loginmsg;
 #endif /* WITH_AIXAUTHENTICATE */
@@ -1129,8 +1130,9 @@
 	if (!pw)
 		return 0;
 
-	/* deny if shell does not exists or is not executable */
-	if (stat(pw->pw_shell, &st) != 0)
+	/* deny if shell is not executable, empty shell defaults to /bin/sh */
+	shell = pw->pw_shell[0]  ? pw->pw_shell : _PATH_BSHELL;
+	if (stat(shell, &st) != 0)
 		return 0;
 	if (!((st.st_mode & S_IFREG) && (st.st_mode &
(S_IXOTH|S_IXUSR|S_IXGRP))))
 		return 0;

A nice

#ifndef _PATH_BSHELL
#define _PATH_BSHELL "/bin/sh"
#endif

would be a nice addition in the defines.h  

and/or a search in the ./configure script for /bin/sh.  Since not
all platforms define a _PATH_BSHELL.

Lucky for me NeXT's sh is standard and is in /bin/sh =)



On Sat, 1 Apr 2000, Theo Nolte wrote:
> Sorry - my previous patch was bad.  Here is the corrected one.
> 
> Cheers, Theo
>