Fix leftover 'if (false) ;' statements

Commit a4b8f653ee5be9c2292c removed the #ifdefs for ENABLE_HTTP_PROXY and ENABLE_SOCKS, thus making this "if (false) ; else if (...)" construct superfluous. Spotted by David Sommerseth.

---
 src/openvpn/socket.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

index f5c740d..afc1e60 100644
@@ -1575,10 +1575,8 @@ link_socket_init_phase1 (struct link_socket *sock,
       sock->sd = accept_from->sd;
     }
 
-  if (false)
-    ;
   /* are we running in HTTP proxy mode? */
-  else if (sock->http_proxy)
+  if (sock->http_proxy)
     {
       ASSERT (sock->info.proto == PROTO_TCP_CLIENT);
       ASSERT (!sock->inetd);

@@ -1793,9 +1791,7 @@ phase2_tcp_client (struct link_socket *sock, struct signal_info *sig_info)
     if (sig_info->signal_received)
       return;
 
-    if (false)
-      ;
-    else if (sock->http_proxy)
+    if (sock->http_proxy)
       {
 	proxy_retry = establish_http_proxy_passthru (sock->http_proxy,
 						     sock->sd,

2.0.5

Am 21.04.15 um 22:49 schrieb Gert Doering:

ACK. I should have removed with my patch in the first place.

Arne

Your patch has been applied to the master branch.

commit 0e3f894098f9286ec3e703ce16fe9bda0cd2c74e

Author: Gert Doering
Date:   Tue Apr 21 22:49:12 2015 +0200

     Fix leftover 'if (false) ;' statements

     Signed-off-by: Gert Doering <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/9603

--
kind regards,

Gert Doering