You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2008/08/13 17:59:29 UTC

svn commit: r685594 - /spamassassin/trunk/spamd/spamd.raw

Author: jm
Date: Wed Aug 13 08:59:28 2008
New Revision: 685594

URL: http://svn.apache.org/viewvc?rev=685594&view=rev
Log:
bug 5943: avoid 'Unsuccessful stat on filename containing newline' warnings from current --vpopmail code

Modified:
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=685594&r1=685593&r2=685594&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Wed Aug 13 08:59:28 2008
@@ -2095,7 +2095,9 @@
       use re 'taint';
       my $vpopdir = $suiddir; # This should work with common vpopmail setups
       $userdir = `$vpopdir/bin/vuserinfo -d \Q$username_untainted\E`;
-      if ($? != 0) {
+      if ($? == 0) {
+        chomp($userdir);
+      } else {
         $userdir = handle_user_vpopmail($username_untainted,$vpopdir);
       }
     } else {