summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2001-02-05 14:54:34 +0000
committerKevin Steves <stevesk@pobox.com>2001-02-05 14:54:34 +0000
commit12057500cc6b2efedca40812cd5541a84e137270 (patch)
tree7a14942c60d8ac9d30dbb0c77741374be057411b /serverloop.c
parentadf74cdeca7e96e9cdcc63342c3290fbd0578ff3 (diff)
- markus@cvs.openbsd.org 2001/01/31 13:37:24
[channels.c channels.h serverloop.c ssh.c] do not disconnect if local port forwarding fails, e.g. if port is already in use - markus@cvs.openbsd.org 2001/02/01 14:58:09 [channels.c] use ipaddr in channel messages, ietf-secsh wants this - markus@cvs.openbsd.org 2001/01/31 12:26:20 [channels.c] ssh.com-2.0.1x does not send additional info in CHANNEL_OPEN_FAILURE messages; bug report from edmundo@rano.org
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c
index 5a567a252..024c54bc3 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.43 2001/01/29 16:55:37 markus Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.45 2001/02/04 15:32:25 stevesk Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -864,12 +864,11 @@ server_input_global_request(int type, int plen, void *ctxt)
864 packet_send_debug("Server has disabled port forwarding."); 864 packet_send_debug("Server has disabled port forwarding.");
865 } else { 865 } else {
866 /* Start listening on the port */ 866 /* Start listening on the port */
867 channel_request_forwarding( 867 success = channel_request_forwarding(
868 listen_address, listen_port, 868 listen_address, listen_port,
869 /*unspec host_to_connect*/ "<unspec host>", 869 /*unspec host_to_connect*/ "<unspec host>",
870 /*unspec port_to_connect*/ 0, 870 /*unspec port_to_connect*/ 0,
871 options.gateway_ports, /*remote*/ 1); 871 options.gateway_ports, /*remote*/ 1);
872 success = 1;
873 } 872 }
874 xfree(listen_address); 873 xfree(listen_address);
875 } 874 }