From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 27 Apr 2021 23:14:25 +0000 (+0100)
Subject: Don't fetch legacy Fortinet config
X-Git-Tag: v8.20~251
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0ca8c632566bf423d3ac23b8b21ef353e399c33;p=users%2Fdwmw2%2Fopenconnect.git

Don't fetch legacy Fortinet config

It really doesn't seem to make any difference.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/fortinet.c b/fortinet.c
index 12c108c2..d32e6943 100644
--- a/fortinet.c
+++ b/fortinet.c
@@ -531,6 +531,7 @@ static int fortinet_configure(struct openconnect_info *vpninfo)
 	 * It's fetching the legacy non-XML configuration, isn't it?
 	 * Do we *actually* have to do this, before fetching the XML config?
 	 */
+#if 0 /* Nah... */
 	free(vpninfo->urlpath);
 	vpninfo->urlpath = strdup("remote/fortisslvpn");
 	ret = do_https_request(vpninfo, "GET", NULL, NULL, &res_buf, 0);
@@ -550,6 +551,7 @@ static int fortinet_configure(struct openconnect_info *vpninfo)
 	/* We don't care what it returned as long as it was successful */
 	free(res_buf);
 	res_buf = NULL;
+#endif
 	free(vpninfo->urlpath);
 
 	/* Now fetch the connection options in XML format */
@@ -560,8 +562,10 @@ static int fortinet_configure(struct openconnect_info *vpninfo)
 			vpn_progress(vpninfo, PRG_ERR,
 				     _("Server doesn't support XML config format. Ancient HTML format is not currently implemented.\n"));
 		goto out;
-	} else if (ret == 0)
-		goto invalid_cookie;
+	} else if (ret == 0) {
+		ret = -EPERM;
+		goto out;
+	}
 
 	ret = parse_fortinet_xml_config(vpninfo, res_buf, ret);
 	if (ret)