Make --proxy-auth=negotiate,basic work for SOCKS auth

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Jun 23, 2014 · d717f23 · d717f23
1 parent 921051b
commit d717f23
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/http.c b/http.c
@@ -1502,9 +1502,12 @@ static int process_socks_proxy(struct openconnect_info *vpninfo)
 
 	buf[2 + nr_auth_methods++] = SOCKS_AUTH_NONE;
 #ifdef HAVE_GSSAPI
-	buf[2 + nr_auth_methods++] = SOCKS_AUTH_GSSAPI;
+	if (vpninfo->auth[AUTH_TYPE_GSSAPI].state != AUTH_DISABLED &&
+	    !vpninfo->proxy_user && !vpninfo->proxy_pass)
+		buf[2 + nr_auth_methods++] = SOCKS_AUTH_GSSAPI;
 #endif
-	if (vpninfo->proxy_user && vpninfo->proxy_pass)
+	if (vpninfo->auth[AUTH_TYPE_BASIC].state != AUTH_DISABLED &&
+	    vpninfo->proxy_user && vpninfo->proxy_pass)
 		buf[2 + nr_auth_methods++] = SOCKS_AUTH_PASSWORD;
 
 	buf[1] = nr_auth_methods;