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 4bc7c97d6ff844c1a3d707e8e4f8b140c1225cb7..75aadc8aebb9447068b43d442f73ff8ca67aa83d 100755 (executable)
--- 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 375b61c647f1714adb25cdb54d0390a002433ad0..388d988bb596b5f75999956399ac18177249e0c1 100755 (executable)
--- 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)