tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2001-03-20 09:15:57 +11:00
parent 9911f12083
commit e7cf07c927
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -2,6 +2,10 @@
- (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS). - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS).
- (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS). - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS).
- (bal) Oops. Missed globc.h change (OpenBSD CVS). - (bal) Oops. Missed globc.h change (OpenBSD CVS).
- (djm) OpenBSD CVS Sync
- 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
20010319 20010319
- (djm) Seed PRNG at startup, rather than waiting for arc4random calls to - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to
@ -4632,4 +4636,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.988 2001/03/19 21:29:30 mouring Exp $ $Id: ChangeLog,v 1.989 2001/03/19 22:15:57 djm Exp $

13
auth.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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 #ifdef HAVE_LOGIN_H
#include <login.h> #include <login.h>
@ -57,7 +57,7 @@ int
allowed_user(struct passwd * pw) allowed_user(struct passwd * pw)
{ {
struct stat st; struct stat st;
char *shell, *cp; char *shell;
int i; int i;
#ifdef WITH_AIXAUTHENTICATE #ifdef WITH_AIXAUTHENTICATE
char *loginmsg; char *loginmsg;
@ -95,15 +95,6 @@ allowed_user(struct passwd * pw)
*/ */
shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; 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 */ /* deny if shell does not exists or is not executable */
if (stat(shell, &st) != 0) if (stat(shell, &st) != 0)
return 0; return 0;

4
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.67 2001/03/10 17:51:04 markus Exp $"); RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -805,7 +805,7 @@ fill_default_options(Options * options)
/* options->ciphers, default set in myproposals.h */ /* options->ciphers, default set in myproposals.h */
/* options->macs, default set in myproposals.h */ /* options->macs, default set in myproposals.h */
if (options->protocol == SSH_PROTO_UNKNOWN) if (options->protocol == SSH_PROTO_UNKNOWN)
options->protocol = SSH_PROTO_1|SSH_PROTO_2; options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
if (options->num_identity_files == 0) { if (options->num_identity_files == 0) {
if (options->protocol & SSH_PROTO_1) { if (options->protocol & SSH_PROTO_1) {
len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;