diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-12 15:19:27 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-12 15:19:27 +1100 |
commit | 6d7b2cd1a32efa2a40c97361065d357a2e60b716 (patch) | |
tree | 9c34abc2723760ce00b6f3867d7e0cfbd6a7424e /sshd.c | |
parent | b5f8927a7e3f25cef4c66603a780176e1b9f6082 (diff) |
- Merged yet more changes from OpenBSD CVS
- [auth-rh-rsa.c auth-rhosts.c auth-rsa.c channels.c clientloop.c]
[ssh.c ssh.h sshconnect.c sshd.c]
make all access to options via 'extern Options options'
and 'extern ServerOptions options' respectively;
options are no longer passed as arguments:
* make options handling more consistent
* remove #include "readconf.h" from ssh.h
* readconf.h is only included if necessary
- [mpaux.c] clear temp buffer
- [servconf.c] print _all_ bad options found in configfile
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.16 1999/11/12 00:33:04 damien Exp $"); +RCSID("$Id: sshd.c,v 1.17 1999/11/12 04:19:27 damien Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -1343,8 +1343,7 @@ do_authentication(char *user, int privileged_port) } /* Try to authenticate using /etc/hosts.equiv and .rhosts. */ - if (auth_rhosts(pw, client_user, options.ignore_rhosts, - options.strict_modes)) + if (auth_rhosts(pw, client_user)) { /* Authentication accepted. */ log("Rhosts authentication accepted for %.100s, remote %.100s on %.700s.", @@ -1431,7 +1430,7 @@ do_authentication(char *user, int privileged_port) packet_integrity_check(plen, nlen, type); - if (auth_rsa(pw, n, options.strict_modes)) + if (auth_rsa(pw, n)) { /* Successful authentication. */ BN_clear_free(n); |