www-cgi: Introduce `?DEFAULTS' pattern to match the default set.

[userv-utils] / www-cgi / ucgi.c

diff --git a/www-cgi/ucgi.c b/www-cgi/ucgi.c
index 5e6a1b863f7d004332483f6b31a22607fa2dacd4..980bec5ca518e09183d9d2a59ac7dc24d3bf535f 100644 (file)
--- a/www-cgi/ucgi.c
+++ b/www-cgi/ucgi.c
@@ -76,7 +76,7 @@ static void add_userv_var(const char *fulln,
 int main(int argc, const char **argv) {
   char *username;
   const char *slash2, *pathi, *ev, *av;
 int main(int argc, const char **argv) {
   char *username;
   const char *slash2, *pathi, *ev, *av;

-  const char *const *envok;
+  const char *const *envok = 0;

   size_t usernamelen, l;
   struct buildargs args;
   pid_t child, rchild;
   size_t usernamelen, l;
   struct buildargs args;
   pid_t child, rchild;


@@ -97,10 +97,8 @@ int main(int argc, const char **argv) {
   ev= getenv("UCGI_ENV_FILTER");
   if (ev)
     envok= load_filters(LOADF_MUST, ev, LF_END);
   ev= getenv("UCGI_ENV_FILTER");
   if (ev)
     envok= load_filters(LOADF_MUST, ev, LF_END);

-  else {
+  else

     envok= load_filters(0, "/etc/userv/ucgi.env-filter", LF_END);
     envok= load_filters(0, "/etc/userv/ucgi.env-filter", LF_END);

-    if (!envok) envok= default_envok;
-  }

 
   pathi= getenv("PATH_INFO");
   if (!pathi) error("PATH_INFO not found");
 
   pathi= getenv("PATH_INFO");
   if (!pathi) error("PATH_INFO not found");


@@ -126,7 +124,8 @@ int main(int argc, const char **argv) {
   addarg(&args, "userv");
   if (debugmode) addarg(&args, "-DDEBUG=1");
 
   addarg(&args, "userv");
   if (debugmode) addarg(&args, "-DDEBUG=1");
 

-  filter_environment(FILTF_WILDCARD, "", envok, add_userv_var, &args);
+  filter_environment(FILTF_WILDCARD, "", envok, default_envok,
+                    add_userv_var, &args);

 
   addarg(&args, username);
   addarg(&args, "www-cgi");
 
   addarg(&args, username);
   addarg(&args, "www-cgi");