diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-15 15:25:10 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-15 15:25:10 +1100 |
| commit | 2ccf661cbe0924a1549a74b5a4f970e90f94d6a9 (patch) | |
| tree | 8bb7ea3cbe9d473e7f46b7084f563cc593cc5d47 /ssh.c | |
| parent | cedfecc99e73f9661d4dc3cea8c88e57c6e0b487 (diff) | |
- Merged more OpenBSD CVS changes:
[auth-krb4.c]
- disconnect if getpeername() fails
- missing xfree(*client)
[canohost.c]
- disconnect if getpeername() fails
- fix comment: we _do_ disconnect if ip-options are set
[sshd.c]
- disconnect if getpeername() fails
- move checking of remote port to central place
[auth-rhosts.c] move checking of remote port to central place
[log-server.c] avoid extra fd per sshd, from millert@
[readconf.c] print _all_ bad config-options in ssh(1), too
[readconf.h] print _all_ bad config-options in ssh(1), too
[ssh.c] print _all_ bad config-options in ssh(1), too
[sshconnect.c] disconnect if getpeername() fails
- OpenBSD's changes to sshd.c broke the PAM stuff, re-merged it.
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 7 |
1 files changed, 4 insertions, 3 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.7 1999/11/13 02:28:45 damien Exp $"); +RCSID("$Id: ssh.c,v 1.8 1999/11/15 04:25:10 damien Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -383,8 +383,9 @@ main(int ac, char **av) case 'o': dummy = 1; - process_config_line(&options, host ? host : "", optarg, - "command-line", 0, &dummy); + if (process_config_line(&options, host ? host : "", optarg, + "command-line", 0, &dummy) != 0) + exit(1); break; default: |