Imported Debian patch 1.6.8p7-1.3

[debian/sudo] / env.c

diff --git a/env.c b/env.c
index 8116178538c5a2afa5ff82a75c986787fa1af2b4..9ef28c874f73047d7015c5bf78ec09943dea8f66 100644 (file)
--- a/env.c
+++ b/env.c
@@ -136,6 +136,7 @@ static const char *initial_checkenv_table[] = {
     "LC_*",
     "LANG",
     "LANGUAGE",
+    "TERM",
     NULL
 };
 
@@ -425,7 +426,7 @@ rebuild_env(envp, sudo_mode, noexec)
         * env_check.
         */
        for (ep = envp; *ep; ep++) {
-           okvar = 1;
+           okvar = 0;
 
            /* Skip variables with values beginning with () (bash functions) */
            if ((cp = strchr(*ep, '=')) != NULL) {
@@ -434,6 +435,7 @@ rebuild_env(envp, sudo_mode, noexec)
            }
 
            /* Skip anything listed in env_delete. */
+#if 0
            for (cur = def_env_delete; cur && okvar; cur = cur->next) {
                len = strlen(cur->value);
                /* Deal with '*' wildcard */
@@ -447,9 +449,10 @@ rebuild_env(envp, sudo_mode, noexec)
                    okvar = 0;
                }
            }
+#endif
 
            /* Check certain variables for '%' and '/' characters. */
-           for (cur = def_env_check; cur && okvar; cur = cur->next) {
+           for (cur = def_env_check; cur; cur = cur->next) {
                len = strlen(cur->value);
                /* Deal with '*' wildcard */
                if (cur->value[len - 1] == '*') {
@@ -459,8 +462,8 @@ rebuild_env(envp, sudo_mode, noexec)
                    iswild = 0;
                if (strncmp(cur->value, *ep, len) == 0 &&
                    (iswild || (*ep)[len] == '=') &&
-                   strpbrk(*ep, "/%")) {
-                   okvar = 0;
+                   strpbrk(*ep, "/%") == NULL) {
+                   okvar = 1;
                }
            }