Lines 2152-2164
Link Here
|
2152 |
my $domain = ''; |
2152 |
my $domain = ''; |
2153 |
if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; } |
2153 |
if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; } |
2154 |
|
2154 |
|
2155 |
$dir =~ s/\%u/${safename}/g; |
2155 |
# Do userdir lookup exim-style. |
2156 |
$dir =~ s/\%l/${localpart}/g; |
2156 |
# If a config for the full address exists, use that one |
2157 |
$dir =~ s/\%d/${domain}/g; |
2157 |
# else look for a domain default |
2158 |
$dir =~ s/\%\%/\%/g; |
2158 |
if ($dir=~/%x/) { |
|
|
2159 |
($userdir=$dir)=~s/%x/${safename}/g; |
2160 |
|
2161 |
$prefsfile=$userdir.'/user_prefs'; |
2162 |
if (-f $prefsfile) { |
2163 |
$dir = $userdir; |
2159 |
|
2164 |
|
2160 |
$userdir = $dir; |
2165 |
} else { |
2161 |
$prefsfile = $dir . '/user_prefs'; |
2166 |
$dir =~ s/%x/${domain}/g; |
|
|
2167 |
|
2168 |
$prefsfile = $dir.'/user_prefs'; |
2169 |
$userdir = $dir; |
2170 |
} |
2171 |
|
2172 |
# Use the normal escaping |
2173 |
} else { |
2174 |
$dir =~ s/\%u/${safename}/g; |
2175 |
$dir =~ s/\%l/${localpart}/g; |
2176 |
$dir =~ s/\%d/${domain}/g; |
2177 |
$dir =~ s/\%\%/\%/g; |
2178 |
|
2179 |
$userdir = $dir; |
2180 |
$prefsfile = $dir . '/user_prefs'; |
2181 |
} |
2162 |
|
2182 |
|
2163 |
# Log that the default configuration is being used for a user. |
2183 |
# Log that the default configuration is being used for a user. |
2164 |
info("spamd: using default config for $username: $prefsfile"); |
2184 |
info("spamd: using default config for $username: $prefsfile"); |