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 /sshconnect.c | |
| parent | cedfecc99e73f9661d4dc3cea8c88e57c6e0b487 (diff) | |
| download | openssh-git-2ccf661cbe0924a1549a74b5a4f970e90f94d6a9.tar.gz | |
- 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 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 03318459..f984bcaa 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -15,7 +15,7 @@ login (authentication) dialog. */ #include "includes.h" -RCSID("$Id: sshconnect.c,v 1.7 1999/11/12 23:51:58 damien Exp $"); +RCSID("$Id: sshconnect.c,v 1.8 1999/11/15 04:25:10 damien Exp $"); #ifdef HAVE_OPENSSL #include <openssl/bn.h> @@ -730,8 +730,10 @@ int try_kerberos_authentication() r = sizeof(foreign); memset(&foreign, 0, sizeof(foreign)); if (getpeername(packet_get_connection_in(), - (struct sockaddr *)&foreign, &r) < 0) + (struct sockaddr *)&foreign, &r) < 0) { debug("getpeername failed: %s", strerror(errno)); + fatal_cleanup(); + } /* Get server reply. */ type = packet_read(&plen); |