summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-06-17 12:55:03 +1000
committerDamien Miller <djm@mindrot.org>2005-06-17 12:55:03 +1000
commit677257fe07dd2b9a58817e1d42fc2c25bb618a4d (patch)
tree087406abe9a0f12491122452ecad2b44a04d7908 /sshd.c
parent17e7ed0e754577ae61cdd5e3f03b33fba2a09337 (diff)
- markus@cvs.openbsd.org 2005/06/16 08:00:00
[canohost.c channels.c sshd.c] don't exit if getpeername fails for forwarded ports; bugzilla #1054; ok djm
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 7ee2dd686..ed4158801 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.309 2005/04/06 09:43:59 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.310 2005/06/16 08:00:00 markus Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -1626,7 +1626,10 @@ main(int ac, char **av)
1626 setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0) 1626 setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0)
1627 error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno)); 1627 error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
1628 1628
1629 remote_port = get_remote_port(); 1629 if ((remote_port = get_remote_port()) < 0) {
1630 debug("get_remote_port failed");
1631 cleanup_exit(255);
1632 }
1630 remote_ip = get_remote_ipaddr(); 1633 remote_ip = get_remote_ipaddr();
1631 1634
1632#ifdef SSH_AUDIT_EVENTS 1635#ifdef SSH_AUDIT_EVENTS