From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 26 Aug 2015 18:34:20 +0000 (+0000)
Subject: Revert "setup script"
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5cb2a912237fca41e50e8c651772bd32d5ff324b;p=people%2Fstevee%2Faiccu.git

Revert "setup script"

This reverts commit bdb25774a216925fd1ca275a6e2b3ccc8e9a0200.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/common/aiccu.c b/common/aiccu.c
index 4bc7c97..75aadc8 100755
--- a/common/aiccu.c
+++ b/common/aiccu.c
@@ -215,6 +215,9 @@ bool aiccu_SaveConfig(const char *filename)
 	fprintf(f, "# Try to automatically login and setup the tunnel?\n");
 	fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false");
 	fprintf(f, "\n");
+	fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
+	fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
+	fprintf(f, "\n");
 	fprintf(f, "# TLS Required?\n");
 	fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false");
 	fprintf(f, "\n");
@@ -231,9 +234,6 @@ bool aiccu_SaveConfig(const char *filename)
 	fprintf(f, "# PID File\n");
 	fprintf(f, "pidfile %s\n", g_aiccu->pidfile);
 	fprintf(f, "\n");
-	fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
-	fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
-	fprintf(f, "\n");
 	fprintf(f, "# Make heartbeats (default true)\n");
 	fprintf(f, "# In general you don't want to turn this off\n");
 	fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n");
diff --git a/unix-console/main.c b/unix-console/main.c
index 375b61c..388d988 100755
--- a/unix-console/main.c
+++ b/unix-console/main.c
@@ -471,11 +471,6 @@ int main(int argc, char *argv[])
 	 */
 	if (aiccu_setup(hTunnel, true))
 	{
-		if (g_aiccu->setupscript)
-		{
-			aiccu_exec("%s", g_aiccu->setupscript);
-		}
-
 		/* We need to stay running when doing Heartbeat or AYIYA */
 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
 			strcasecmp(hTunnel->sType, "ayiya") == 0)