--- gvpe/src/conf.C	2005/03/01 06:27:20	1.29
+++ gvpe/src/conf.C	2005/03/03 07:24:57	1.30
@@ -95,7 +95,10 @@
 
   free (nodename);
   free (hostname);
+#if ENABLE_DNS
   free (domain);
+  free (dns_hostname);
+#endif
 }
 
 void configuration::init ()
@@ -118,6 +121,11 @@
   default_node.protocols   = 0;
   default_node.max_retry   = DEFAULT_MAX_RETRY;
 
+#if ENABLE_DNS
+  default_node.dns_port    = 53;
+  dns_forw_port            = 53;
+#endif
+
   conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
 }
 
@@ -313,18 +321,12 @@
             free (script_node_down), script_node_down = strdup (val);
           else if (!strcmp (var, "pid-file"))
             free (pidfilename), pidfilename = strdup (val);
-          else if (!strcmp (var, "dns-forw-host"))
-            {
 #if ENABLE_DNS
-              free (dns_forw_host), dns_forw_host = strdup (val);
-#endif
-            }
+          else if (!strcmp (var, "dns-forw-host"))
+            free (dns_forw_host), dns_forw_host = strdup (val);
           else if (!strcmp (var, "dns-forw-port"))
-            {
-#if ENABLE_DNS
-              dns_forw_port = atoi (val);
+            dns_forw_port = atoi (val);
 #endif
-            }
           else if (!strcmp (var, "http-proxy-host"))
             {
 #if ENABLE_HTTP_PROXY
@@ -353,12 +355,12 @@
             node->udp_port = atoi (val);
           else if (!strcmp (var, "tcp-port"))
             node->tcp_port = atoi (val);
-          else if (!strcmp (var, "dns-port"))
-            {
 #if ENABLE_DNS
-              node->dns_port = atoi (val);
+          else if (!strcmp (var, "dns-hostname"))
+            free (node->dns_hostname), node->dns_hostname = strdup (val);
+          else if (!strcmp (var, "dns-port"))
+            node->dns_port = atoi (val);
 #endif
-            }
           else if (!strcmp (var, "dns-domain"))
             {
 #if ENABLE_DNS