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 /ssh.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 'ssh.c')
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,7 +18,7 @@ Modified to work with SSL by Niels Provos <provos@citi.umich.edu> in Canada. */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.5 1999/11/11 06:57:40 damien Exp $"); +RCSID("$Id: ssh.c,v 1.6 1999/11/12 04:19:27 damien Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -590,7 +590,7 @@ main(int ac, char **av) /* Log into the remote system. This never returns if the login fails. */ ssh_login(host_private_key_loaded, host_private_key, - host, &hostaddr, &options, original_real_uid); + host, &hostaddr, original_real_uid); /* We no longer need the host private key. Clear it now. */ if (host_private_key_loaded) |