From: Steffan Karger Date: Wed, 13 Jan 2016 16:09:08 +0000 (+0100) Subject: socks.c: fix check on get_user_pass() return value(s) X-Git-Tag: v2.4_alpha1~156 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=982ab2364a68f2fca0cb9219b31bdabcd5aa4b49;p=thirdparty%2Fopenvpn.git socks.c: fix check on get_user_pass() return value(s) My compiler rightfully complains that the checks on creds.username and creds.password always evaluate to true, so remove those checks. Judging from the code, they were meant to check the returned values by get_user_pass(). So instead of these non-functioning checks, just check the return value of get_user_pass(). Signed-off-by: Steffan Karger Acked-by: Gert Doering Message-Id: <1452701348-9577-1-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/10993 Signed-off-by: Gert Doering --- diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 72bdf5503..cef7a35e7 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -103,10 +103,13 @@ socks_username_password_auth (struct socks_proxy_info *p, ssize_t size; creds.defined = 0; - get_user_pass (&creds, p->authfile, UP_TYPE_SOCKS, GET_USER_PASS_MANAGEMENT); + if (!get_user_pass (&creds, p->authfile, UP_TYPE_SOCKS, GET_USER_PASS_MANAGEMENT)) + { + msg (M_NONFATAL, "SOCKS failed to get username/password."); + return false; + } - if( !creds.username || (strlen(creds.username) > 255) - || !creds.password || (strlen(creds.password) > 255) ) { + if( (strlen(creds.username) > 255) || (strlen(creds.password) > 255) ) { msg (M_NONFATAL, "SOCKS username and/or password exceeds 255 characters. " "Authentication not possible.");