@@ -350,93 +350,6 @@ transport_value(const enum dns_server_transport transport)

     }

 }

-static void

-setenv_dns_option(struct env_set *es,

-                  const char *format, int i, int j,

-                  const char *value)

-{

-    char name[64];

-    bool name_ok = false;

-

-    if (j < 0)

-    {

-        name_ok = snprintf(name, sizeof(name), format, i);

-    }

-    else

-    {

-        name_ok = snprintf(name, sizeof(name), format, i, j);

-    }

-

-    if (!name_ok)

-    {

-        msg(M_WARN, "WARNING: dns option setenv name buffer overflow");

-    }

-

-    setenv_str(es, name, value);

-}

-

-void

-setenv_dns_options(const struct dns_options *o, struct env_set *es)

-{

-    struct gc_arena gc = gc_new();

-    const struct dns_server *s;

-    const struct dns_domain *d;

-    int i, j;

-

-    for (i = 1, d = o->search_domains; d != NULL; i++, d = d->next)

-    {

-        setenv_dns_option(es, "dns_search_domain_%d", i, -1, d->name);

-    }

-

-    for (i = 1, s = o->servers; s != NULL; i++, s = s->next)

-    {

-        for (j = 0; j < s->addr_count; ++j)

-        {

-            if (s->addr[j].family == AF_INET)

-            {

-                setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1,

-                                  print_in_addr_t(s->addr[j].in.a4.s_addr, IA_NET_ORDER, &gc));

-            }

-            else

-            {

-                setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1,

-                                  print_in6_addr(s->addr[j].in.a6, 0, &gc));

-            }

-            if (s->addr[j].port)

-            {

-                setenv_dns_option(es, "dns_server_%d_port_%d", i, j + 1,

-                                  print_in_port_t(s->addr[j].port, &gc));

-            }

-        }

-

-        if (s->domains)

-        {

-            for (j = 1, d = s->domains; d != NULL; j++, d = d->next)

-            {

-                setenv_dns_option(es, "dns_server_%d_resolve_domain_%d", i, j, d->name);

-            }

-        }

-

-        if (s->dnssec)

-        {

-            setenv_dns_option(es, "dns_server_%d_dnssec", i, -1,

-                              dnssec_value(s->dnssec));

-        }

-

-        if (s->transport)

-        {

-            setenv_dns_option(es, "dns_server_%d_transport", i, -1,

-                              transport_value(s->transport));

-        }

-        if (s->sni)

-        {

-            setenv_dns_option(es, "dns_server_%d_sni", i, -1, s->sni);

-        }

-    }

-

-    gc_free(&gc);

-}

-

 #ifdef _WIN32

 static void

@@ -554,6 +467,93 @@ run_up_down_service(bool add, const struct options *o, const struct tuntap *tt)

 #else /* ifdef _WIN32 */

 static void

+setenv_dns_option(struct env_set *es,

+                  const char *format, int i, int j,

+                  const char *value)

+{

+    char name[64];

+    bool name_ok = false;

+

+    if (j < 0)

+    {

+        name_ok = snprintf(name, sizeof(name), format, i);

+    }

+    else

+    {

+        name_ok = snprintf(name, sizeof(name), format, i, j);

+    }

+

+    if (!name_ok)

+    {

+        msg(M_WARN, "WARNING: dns option setenv name buffer overflow");

+    }

+

+    setenv_str(es, name, value);

+}

+

+static void

+setenv_dns_options(const struct dns_options *o, struct env_set *es)

+{

+    struct gc_arena gc = gc_new();

+    const struct dns_server *s;

+    const struct dns_domain *d;

+    int i, j;

+

+    for (i = 1, d = o->search_domains; d != NULL; i++, d = d->next)

+    {

+        setenv_dns_option(es, "dns_search_domain_%d", i, -1, d->name);

+    }

+

+    for (i = 1, s = o->servers; s != NULL; i++, s = s->next)

+    {

+        for (j = 0; j < s->addr_count; ++j)

+        {

+            if (s->addr[j].family == AF_INET)

+            {

+                setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1,

+                                  print_in_addr_t(s->addr[j].in.a4.s_addr, IA_NET_ORDER, &gc));

+            }

+            else

+            {

+                setenv_dns_option(es, "dns_server_%d_address_%d", i, j + 1,

+                                  print_in6_addr(s->addr[j].in.a6, 0, &gc));

+            }

+            if (s->addr[j].port)

+            {

+                setenv_dns_option(es, "dns_server_%d_port_%d", i, j + 1,

+                                  print_in_port_t(s->addr[j].port, &gc));

+            }

+        }

+

+        if (s->domains)

+        {

+            for (j = 1, d = s->domains; d != NULL; j++, d = d->next)

+            {

+                setenv_dns_option(es, "dns_server_%d_resolve_domain_%d", i, j, d->name);

+            }

+        }

+

+        if (s->dnssec)

+        {

+            setenv_dns_option(es, "dns_server_%d_dnssec", i, -1,

+                              dnssec_value(s->dnssec));

+        }

+

+        if (s->transport)

+        {

+            setenv_dns_option(es, "dns_server_%d_transport", i, -1,

+                              transport_value(s->transport));

+        }

+        if (s->sni)

+        {

+            setenv_dns_option(es, "dns_server_%d_sni", i, -1, s->sni);

+        }

+    }

+

+    gc_free(&gc);

+}

+

+static void

 updown_env_set(bool up, const struct dns_options *o, const struct tuntap *tt, struct env_set *es)

 {

     setenv_str(es, "dev", tt->actual_name);

@@ -168,14 +168,6 @@ void run_dns_up_down(bool up, struct options *o, const struct tuntap *tt,

                      struct dns_updown_runner_info *duri);

 /**

- * Puts the DNS options into an environment set.

- *

- * @param   o           Pointer to the DNS options to set

- * @param   es          Pointer to the env_set to set the options into

- */

-void setenv_dns_options(const struct dns_options *o, struct env_set *es);

-

-/**

  * Prints configured DNS options.

  *

  * @param   o           Pointer to the DNS options to print

@@ -1059,11 +1059,6 @@ setenv_settings(struct env_set *es, const struct options *o)

             setenv_local_entry(es, o->ce.local_list->array[i], i+1);

         }

     }

-

-    if (!o->pull)

-    {

-        setenv_dns_options(&o->dns_options, es);

-    }

 }

 #ifndef _WIN32

@@ -4182,7 +4177,6 @@ options_postprocess_pull(struct options *o, struct env_set *es)

     if (success)

     {

         dns_options_postprocess_pull(&o->dns_options);

-        setenv_dns_options(&o->dns_options, es);

 #if defined(_WIN32) || defined(TARGET_ANDROID)

         tuntap_options_copy_dns(o);

 #else