Streamline socks5_connect() slightly

diff --git a/gateway.c b/gateway.c
index f28823b..b65991a 100644 (file)
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.80 2011/10/23 11:20:51 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.81 2011/10/23 11:21:09 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $


@@ -1093,10 +1093,8 @@ static jb_socket socks5_connect(const struct forward_spec *fwd,
    if (server_size != sizeof(sbuf))
    {
       errstr = "SOCKS5 negotiation read failed";
    if (server_size != sizeof(sbuf))
    {
       errstr = "SOCKS5 negotiation read failed";

-      err = 1;

    }
    }

-
-   if (!err)
+   else

    {
       if (sbuf[0] != '\x05')
       {
    {
       if (sbuf[0] != '\x05')
       {