Set script environment earlier, so it applies to script_tun too

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

diff --git a/tun.c b/tun.c
index d141f6c..cdae108 100644 (file)
--- a/tun.c
+++ b/tun.c
@@ -333,8 +333,6 @@ static void set_script_env(struct openconnect_info *vpninfo)
 
 static int script_config_tun(struct openconnect_info *vpninfo)
 {
-       set_script_env(vpninfo);
-
        if (system(vpninfo->vpnc_script)) {
                int e = errno;
                vpninfo->progress(vpninfo, PRG_ERR,
@@ -351,6 +349,8 @@ int setup_tun(struct openconnect_info *vpninfo)
 {
        int tun_fd;
 
+       set_script_env(vpninfo);
+
        if (vpninfo->script_tun) {
                pid_t child;
                int fds[2];