summaryrefslogtreecommitdiffstats
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-07-06 09:36:05 +1000
committerDamien Miller <djm@mindrot.org>2005-07-06 09:36:05 +1000
commita7270309fc5e95b29c91d0190b13ef5a9b1df339 (patch)
tree3013baf9b6554b0e738128f27bb8243c58dfbb9c /channels.c
parentdba6354c05da46a185fc792126077fc2162efd82 (diff)
- markus@cvs.openbsd.org 2005/07/01 13:19:47
[channels.c] don't free() if getaddrinfo() fails; report mpech@
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/channels.c b/channels.c
index 7ca1c53b..b5890232 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.217 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: channels.c,v 1.218 2005/07/01 13:19:47 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -2196,11 +2196,11 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
if (host == NULL) {
error("No forward host name.");
- return success;
+ return 0;
}
if (strlen(host) > SSH_CHANNEL_PATH_LEN - 1) {
error("Forward host name too long.");
- return success;
+ return 0;
}
/*
@@ -2251,12 +2251,10 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
packet_disconnect("getaddrinfo: fatal error: %s",
gai_strerror(r));
} else {
- verbose("channel_setup_fwd_listener: "
- "getaddrinfo(%.64s): %s", addr, gai_strerror(r));
- packet_send_debug("channel_setup_fwd_listener: "
+ error("channel_setup_fwd_listener: "
"getaddrinfo(%.64s): %s", addr, gai_strerror(r));
}
- aitop = NULL;
+ return 0;
}
for (ai = aitop; ai; ai = ai->ai_next) {