[SACVS] CVS: spamassassin/spamd spamd.raw,1.220,1.221

Update of /cvsroot/spamassassin/spamassassin/spamd
In directory sc8-pr-cvs1:/tmp/cvs-serv22252/spamd

Modified Files:
        spamd.raw 
Log Message:
bug 2511: clean the path before running Cwd


Index: spamd.raw
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/spamd/spamd.raw,v
retrieving revision 1.220
retrieving revision 1.221
diff -b -w -u -d -r1.220 -r1.221
--- spamd.raw   23 Sep 2003 21:37:03 -0000      1.220
+++ spamd.raw   27 Sep 2003 01:26:29 -0000      1.221
@@ -86,8 +86,9 @@
 # Testing for taintedness only works before detainting %ENV
 Mail::SpamAssassin::Util::am_running_in_taint_mode();
 
-# First untaint the environment -- need to do this before Cwd::cwd(), else
-# it will croak.
+# First clean PATH and untaint the environment -- need to do this before
+# Cwd::cwd(), else it will croak.
+Mail::SpamAssassin::Util::clean_path_in_taint_mode();
 Mail::SpamAssassin::Util::untaint_var(\%ENV);
 
 # The zeroth argument will be replaced in daemonize().
@@ -415,8 +416,6 @@
     $setuid_to_user = 1;
   }
 }
-
-Mail::SpamAssassin::Util::clean_path_in_taint_mode();
 
 # restart handling.  do this here before compile_now() as that may
 # take a while.



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf