diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth.c | 13 | ||||
-rw-r--r-- | readconf.c | 4 |
3 files changed, 9 insertions, 14 deletions
@@ -2,6 +2,10 @@ | |||
2 | - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS). | 2 | - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS). |
3 | - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS). | 3 | - (bal) glob.c update to set gl_pathv to NULL (OpenBSD CVS). |
4 | - (bal) Oops. Missed globc.h change (OpenBSD CVS). | 4 | - (bal) Oops. Missed globc.h change (OpenBSD CVS). |
5 | - (djm) OpenBSD CVS Sync | ||
6 | - markus@cvs.openbsd.org 2001/03/19 17:07:23 | ||
7 | [auth.c readconf.c] | ||
8 | undo /etc/shell and proto 2,1 change for openssh-2.5.2 | ||
5 | 9 | ||
6 | 20010319 | 10 | 20010319 |
7 | - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to | 11 | - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to |
@@ -4632,4 +4636,4 @@ | |||
4632 | - Wrote replacements for strlcpy and mkdtemp | 4636 | - Wrote replacements for strlcpy and mkdtemp |
4633 | - Released 1.0pre1 | 4637 | - Released 1.0pre1 |
4634 | 4638 | ||
4635 | $Id: ChangeLog,v 1.988 2001/03/19 21:29:30 mouring Exp $ | 4639 | $Id: ChangeLog,v 1.989 2001/03/19 22:15:57 djm Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth.c,v 1.20 2001/03/17 17:27:59 markus Exp $"); | 26 | RCSID("$OpenBSD: auth.c,v 1.21 2001/03/19 17:07:23 markus Exp $"); |
27 | 27 | ||
28 | #ifdef HAVE_LOGIN_H | 28 | #ifdef HAVE_LOGIN_H |
29 | #include <login.h> | 29 | #include <login.h> |
@@ -57,7 +57,7 @@ int | |||
57 | allowed_user(struct passwd * pw) | 57 | allowed_user(struct passwd * pw) |
58 | { | 58 | { |
59 | struct stat st; | 59 | struct stat st; |
60 | char *shell, *cp; | 60 | char *shell; |
61 | int i; | 61 | int i; |
62 | #ifdef WITH_AIXAUTHENTICATE | 62 | #ifdef WITH_AIXAUTHENTICATE |
63 | char *loginmsg; | 63 | char *loginmsg; |
@@ -95,15 +95,6 @@ allowed_user(struct passwd * pw) | |||
95 | */ | 95 | */ |
96 | shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; | 96 | shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; |
97 | 97 | ||
98 | /* disallow anyone who does not have a standard shell */ | ||
99 | setusershell(); | ||
100 | while ((cp = getusershell()) != NULL) | ||
101 | if (strcmp(cp, shell) == 0) | ||
102 | break; | ||
103 | endusershell(); | ||
104 | if (cp == NULL) | ||
105 | return 0; | ||
106 | |||
107 | /* deny if shell does not exists or is not executable */ | 98 | /* deny if shell does not exists or is not executable */ |
108 | if (stat(shell, &st) != 0) | 99 | if (stat(shell, &st) != 0) |
109 | return 0; | 100 | return 0; |
diff --git a/readconf.c b/readconf.c index 33d40e8c3..e28ac484b 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.67 2001/03/10 17:51:04 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -805,7 +805,7 @@ fill_default_options(Options * options) | |||
805 | /* options->ciphers, default set in myproposals.h */ | 805 | /* options->ciphers, default set in myproposals.h */ |
806 | /* options->macs, default set in myproposals.h */ | 806 | /* options->macs, default set in myproposals.h */ |
807 | if (options->protocol == SSH_PROTO_UNKNOWN) | 807 | if (options->protocol == SSH_PROTO_UNKNOWN) |
808 | options->protocol = SSH_PROTO_1|SSH_PROTO_2; | 808 | options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; |
809 | if (options->num_identity_files == 0) { | 809 | if (options->num_identity_files == 0) { |
810 | if (options->protocol & SSH_PROTO_1) { | 810 | if (options->protocol & SSH_PROTO_1) { |
811 | len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; | 811 | len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; |