SHELL is out, from Michael Reed

[opendoas.git] / doas.c

diff --git a/doas.c b/doas.c
index 8db988ea242885ab834c4f9b3575b4de6dfc0ff4..a712bc3799970a2f6096d82ac16ed9ef1c3fd1ec 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.9 2015/07/18 18:44:26 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.13 2015/07/20 01:00:48 tedu Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -188,34 +188,52 @@ static char **
 copyenv(const char **oldenvp, struct rule *rule)
 {
        const char *safeset[] = {
-               "DISPLAY", "HOME", "LOGNAME", "MAIL", "SHELL",
+               "DISPLAY", "HOME", "LOGNAME", "MAIL",
                "PATH", "TERM", "USER", "USERNAME",
-               NULL,
+               NULL
+       };
+       const char *badset[] = {
+               "ENV",
+               NULL
        };
        char **envp;
        const char **extra;
        int ei;
-       int i, j;
-       int nsafe;
+       int nsafe, nbad;
        int nextras = 0;
        
+       nbad = arraylen(badset);
        if ((rule->options & KEEPENV) && !rule->envlist) {
-               j = arraylen(oldenvp);
-               envp = reallocarray(NULL, j + 1, sizeof(char *));
+               size_t i, ii;
+               size_t oldlen = arraylen(oldenvp);
+               envp = reallocarray(NULL, oldlen + 1, sizeof(char *));
                if (!envp)
                        err(1, "reallocarray");
-               for (i = 0; i < j; i++) {
-                       if (!(envp[i] = strdup(oldenvp[i])))
-                               err(1, "strdup");
+               for (ii = i = 0; i < oldlen; i++) {
+                       size_t j;
+                       for (j = 0; j < nbad; j++) {
+                               size_t len = strlen(badset[j]);
+                               if (strncmp(oldenvp[i], badset[j], len) == 0 &&
+                                   oldenvp[i][len] == '=') {
+                                       break;
+                               }
+                       }
+                       if (j == nbad) {
+                               if (!(envp[ii] = strdup(oldenvp[i])))
+                                       err(1, "strdup");
+                               ii++;
+                       }
                }
-               envp[i] = NULL;
+               envp[ii] = NULL;
                return envp;
        }
 
        nsafe = arraylen(safeset);
        if ((extra = rule->envlist)) {
+               size_t i;
                nextras = arraylen(extra);
                for (i = 0; i < nsafe; i++) {
+                       size_t j;
                        for (j = 0; j < nextras; j++) {
                                if (strcmp(extra[j], safeset[i]) == 0) {
                                        extra[j--] = extra[nextras--];