From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 4 Nov 2008 12:55:13 +0000 (+0000)
Subject: Set vpninfo->progress earlier to avoid segfaults with XML file
X-Git-Tag: v0.97~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afd96f654cb265909f7e3a1f83a62df27cf50374;p=platform%2Fupstream%2Fopenconnect.git

Set vpninfo->progress earlier to avoid segfaults with XML file

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/main.c b/main.c
index 44b4405..df4f3d3 100644
--- a/main.c
+++ b/main.c
@@ -281,13 +281,6 @@ int main(int argc, char **argv)
 	if (!vpninfo->sslkey)
 		vpninfo->sslkey = vpninfo->cert;
 
-	if (config_lookup_host(vpninfo, argv[optind]))
-		exit(1);
-
-	if (!vpninfo->hostname)
-		vpninfo->hostname = strdup(argv[optind]);
-	vpninfo->urlpath = strdup("/");
-
 	if (use_syslog) {
 		openlog("openconnect", LOG_PID, LOG_DAEMON);
 		vpninfo->progress = syslog_progress;
@@ -295,6 +288,13 @@ int main(int argc, char **argv)
 		vpninfo->progress = write_progress;
 	}
 
+	if (config_lookup_host(vpninfo, argv[optind]))
+		exit(1);
+
+	if (!vpninfo->hostname)
+		vpninfo->hostname = strdup(argv[optind]);
+	vpninfo->urlpath = strdup("/");
+
 #ifdef SSL_UI
 	set_openssl_ui();
 #endif