[vlc-commits] SOCKSv5: fix inverted logic (fixes #10247)

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 28 13:03:53 2013 +0200| [6280e9e5da99fc5a3db3a6cc00cef4f2d5b0010a] | committer: Felix Paul Kühne

SOCKSv5: fix inverted logic (fixes #10247)

(cherry picked from commit dcfe8660d41dbb2b519949ff767c7088a969525a)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=6280e9e5da99fc5a3db3a6cc00cef4f2d5b0010a
---

 src/network/tcp.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 9e0442c..37376f9 100644
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -348,17 +348,14 @@ static int SocksNegotiate( vlc_object_t *p_obj,
         return VLC_SUCCESS;
 
     /* We negotiate authentication */
-
-    if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) )
-        b_auth = true;
-
     buffer[0] = i_socks_version;    /* SOCKS version */
-    if( b_auth )
+    if( psz_socks_user != NULL && psz_socks_passwd != NULL )
     {
         buffer[1] = 2;                  /* Number of methods */
         buffer[2] = 0x00;               /* - No auth required */
         buffer[3] = 0x02;               /* - USer/Password */
         i_len = 4;
+        b_auth = true;
     }
     else
     {