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 2007/06/22 16:35:16 UTC
svn commit: r549829 - /spamassassin/trunk/spamd/spamd.raw
Author: jm
Date: Fri Jun 22 07:35:15 2007
New Revision: 549829
URL: http://svn.apache.org/viewvc?view=rev&rev=549829
Log:
bug 5522: spamd -x -u was attempting to switch uid to the username passed from spamc, contradicting the documentation. fix
Modified:
spamassassin/trunk/spamd/spamd.raw
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?view=diff&rev=549829&r1=549828&r2=549829
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Fri Jun 22 07:35:15 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 {