svn commit: r553313 - /spamassassin/branches/3.2/spamd/spamd.raw

[si...@apache.org]

Author: sidney
Date: Wed Jul  4 12:44:12 2007
New Revision: 553313

URL: http://svn.apache.org/viewvc?view=rev&rev=553313
Log:
bug 5522: spamd -x -u was attempting to switch uid to the username passed from spamc, contradicting the documentation.  fix

Modified:
    spamassassin/branches/3.2/spamd/spamd.raw

Modified: spamassassin/branches/3.2/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.2/spamd/spamd.raw?view=diff&rev=553313&r1=553312&r2=553313
==============================================================================
--- spamassassin/branches/3.2/spamd/spamd.raw (original)
+++ spamassassin/branches/3.2/spamd/spamd.raw Wed Jul  4 12:44:12 2007
@@ -2038,12 +2038,11 @@
 sub handle_user_setuid_basic {
   my $username = shift;
 
-  #
-  # If vpopmail config enabled then look up userinfo for vpopmail uid
-  # as defined by $opt{'username'} or as passed via $username
+  # If $opt{'username'} in use, then look up userinfo for that uid;
+  # otherwise use what was passed via $username
   #
   my $userid = '';
-  if ( $opt{'vpopmail'} && $opt{'username'} ) {
+  if ( $opt{'username'} ) {
     $userid = $opt{'username'};
   }
   else {