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 /auth-rh-rsa.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 'auth-rh-rsa.c')
| -rw-r--r-- | auth-rh-rsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c index b6f1d6c7..fa855a1a 100644 --- a/auth-rh-rsa.c +++ b/auth-rh-rsa.c @@ -15,7 +15,7 @@ authentication. */ #include "includes.h" -RCSID("$Id: auth-rh-rsa.c,v 1.3 1999/11/12 00:33:04 damien Exp $"); +RCSID("$Id: auth-rh-rsa.c,v 1.4 1999/11/12 04:19:27 damien Exp $"); #include "packet.h" #include "ssh.h" @@ -38,7 +38,7 @@ int auth_rhosts_rsa(struct passwd *pw, const char *client_user, debug("Trying rhosts with RSA host authentication for %.100s", client_user); /* Check if we would accept it using rhosts authentication. */ - if (!auth_rhosts(pw, client_user, options.ignore_rhosts, options.strict_modes)) + if (!auth_rhosts(pw, client_user)) return 0; canonical_hostname = get_canonical_hostname(); |