--- gvpe/src/conf.C	2011/03/06 19:40:28	1.55
+++ gvpe/src/conf.C	2012/12/04 10:29:43	1.59
@@ -40,6 +40,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <pwd.h>
 
 #include "netcompat.h"
 
@@ -182,6 +183,7 @@
 #if ENABLE_DNS
   free (dns_forw_host);      dns_forw_host      = 0;
 #endif
+  free (change_root);        change_root        = 0;
   free (script_if_up);       script_if_up       = 0;
   free (script_node_up);     script_node_up     = 0;
   free (script_node_change); script_node_change = 0;
@@ -214,7 +216,7 @@
   else if (!strcmp (val, "on"))		target = trueval;	\
   else if (!strcmp (val, "off"))	target = falseval;	\
   else								\
-    return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
+    return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
 } while (0)
 
 const char *
@@ -242,13 +244,13 @@
   char *val = strtok (NULL, "\t\n\r =");
 
   if (!val || val[0] == '#')
-    return _("no value given for variable. (ignored)");
+    return _("no value given for variable, ignored");
 
   else if (!strcmp (var, "on"))
     {
-      if (!::thisnode
-          || (val[0] == '!' && strcmp (val + 1, ::thisnode))
-          || !strcmp (val, ::thisnode))
+      if (::thisnode
+          && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
+              || !strcmp (val, ::thisnode)))
         return parse_line (strtok (NULL, "\n\r"));
     }
 
@@ -265,7 +267,7 @@
       loglevel l = string_to_loglevel (val);
 
       if (l == L_NONE)
-        return _("unknown loglevel. (skipping)");
+        return _("unknown loglevel, ignored");
     }
   else if (!strcmp (var, "ip-proto"))
     conf.ip_proto = atoi (val);
@@ -275,8 +277,23 @@
       conf.icmp_type = atoi (val);
 #endif
     }
+  else if (!strcmp (var, "chuser"))
+    {
+      struct passwd *pw = getpwnam (val);
+      if (!pw)
+        return _("user specified for chuser not found");
+
+      conf.change_uid = pw->pw_uid;
+      conf.change_gid = pw->pw_gid;
+    }
+  else if (!strcmp (var, "chuid"))
+    conf.change_uid = atoi (val);
+  else if (!strcmp (var, "chgid"))
+    conf.change_gid = atoi (val);
+  else if (!strcmp (var, "chroot"))
+    free (conf.change_root), conf.change_root = strdup (val);
 
-  // per config
+  // per node
   else if (!strcmp (var, "node"))
     {
       parse_argv ();
@@ -451,7 +468,7 @@
       else if (!strcmp (val, "disabled"))
         node->connectmode = conf_node::C_DISABLED;
       else
-        return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
+        return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
     }
   else if (!strcmp (var, "inherit-tos"))
     parse_bool (node->inherit_tos, "inherit-tos", true, false);
@@ -558,7 +575,6 @@
     {
       char line [2048];
       int lineno = 0;
-      node = &conf.default_node;
 
       while (fgets (line, sizeof (line), f))
         {
@@ -590,6 +606,7 @@
   char *fname;
 
   conf.clear ();
+  node = &conf.default_node;
 
   asprintf (&fname, "%s/gvpe.conf", confbase);
   parse_file (fname);