- 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

diff --git a/ChangeLog b/ChangeLog
index 75c43552da0a96736cd9019b258d3fa8e2d41a9f..93a975af9a980686c4dffbba533ac4dd1e97f4ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (bal) glob.c update to added GLOB_LIMITS (OpenBSD CVS).
  - (bal) glob.c update to set gl_pathv to NULL (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
  - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to 

diff --git a/auth.c b/auth.c
index 14e7f7e7125501b4507dd08947d7414688a4ee0f..1f976eee2083dd7ff4730b0dd82a1ff6db4a5567 100644 (file)
--- 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;

diff --git a/readconf.c b/readconf.c
index 33d40e8c3b854754182e4126423d9610a3108c5e..e28ac484b47ec978d13c9c39bfc4800e44682495 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #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 "xmalloc.h"
@@ -805,7 +805,7 @@ fill_default_options(Options * options)
        /* options->ciphers, default set in myproposals.h */
        /* options->macs, default set in myproposals.h */
        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->protocol & SSH_PROTO_1) {
                        len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;