prepare to upload

[debian/sudo] / env.c

diff --git a/env.c b/env.c
index 75457b91310490654e22dcc8f7e7add1a2d2b782..88e6553ea66e9d6fa97b6f4dccea5146375fd79e 100644 (file)
--- a/env.c
+++ b/env.c
@@ -49,10 +49,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: env.c,v 1.106 2009/06/23 18:24:42 millert Exp $";
-#endif /* lint */
-
 /*
  * Flags used in rebuild_env()
  */
@@ -120,8 +116,6 @@ static struct environment env;
 static const char *initial_badenv_table[] = {
     "IFS",
     "CDPATH",
-    "SHELLOPTS",
-    "PS4",
     "LOCALDOMAIN",
     "RES_OPTIONS",
     "HOSTALIASES",
@@ -604,17 +598,6 @@ rebuild_env(sudo_mode, noexec)
            if (keepit == -1)
                keepit = matches_env_keep(*ep);
 
-           if (!strncmp (*ep, "DISPLAY=",8)
-               || !strncmp (*ep, "XAUTHORITY=", 11)
-               || !strncmp (*ep, "XAUTHORIZATION=", 15)
-               || !strncmp (*ep, "XAPPLRESDIR=", 12)
-               || !strncmp (*ep, "XFILESEARCHPATH=", 16)
-               || !strncmp (*ep, "XUSERFILESEARCHPATH=", 20)
-               || !strncmp (*ep, "LANG=", 5)
-               || !strncmp (*ep, "LANGUAGE=", 9)
-               || !strncmp (*ep, "LC_", 3))
-             keepit = 1;
-
            /* For SUDO_PS1 -> PS1 conversion. */
            if (strncmp(*ep, "SUDO_PS1=", 8) == 0)
                ps1 = *ep + 5;