From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 25 Jun 2012 13:00:24 +0000 (+0200)
Subject: Small fixes in proxy code.
X-Git-Tag: import-tinc-1.1~369^2~4
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=c0af4c37d2046ffb3e07dd62f266a4fb99ea5614;p=meshlink

Small fixes in proxy code.
---

diff --git a/src/net_socket.c b/src/net_socket.c
index 457392ef..f49832f8 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -346,7 +346,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 	exit(result);
 #else
 	logger(LOG_ERR, "Proxy type exec not supported on this platform!");
-	return false;
+	return;
 #endif
 }
 
@@ -411,9 +411,9 @@ begin:
 	if(!proxytype) {
 		c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 		configure_tcp(c);
-	} if(proxytype == PROXY_EXEC) {
+	} else if(proxytype == PROXY_EXEC) {
 		do_outgoing_pipe(c, proxyhost);
-	}  else {
+	} else {
 		proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
 		if(!proxyai)
 			goto begin;