|
Lines 2257-2269
Link Here
|
| 2257 |
my $domain = ''; |
2257 |
my $domain = ''; |
| 2258 |
if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; } |
2258 |
if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; } |
| 2259 |
|
2259 |
|
| 2260 |
$dir =~ s/\%u/${safename}/g; |
2260 |
# Do userdir lookup exim-style. |
| 2261 |
$dir =~ s/\%l/${localpart}/g; |
2261 |
# If a config for the full address exists, use that one |
| 2262 |
$dir =~ s/\%d/${domain}/g; |
2262 |
# else look for a domain default |
| 2263 |
$dir =~ s/\%\%/\%/g; |
2263 |
if ($dir=~/%x/) { |
|
|
2264 |
($userdir=$dir)=~s/%x/${safename}/g; |
| 2264 |
|
2265 |
|
| 2265 |
$userdir = $dir; |
2266 |
$prefsfile=$userdir.'/user_prefs'; |
| 2266 |
$prefsfile = $dir . '/user_prefs'; |
2267 |
if (-f $prefsfile) { |
|
|
2268 |
$dir = $userdir; |
| 2269 |
|
| 2270 |
} else { |
| 2271 |
$dir =~ s/%x/${domain}/g; |
| 2272 |
|
| 2273 |
$prefsfile = $dir.'/user_prefs'; |
| 2274 |
$userdir = $dir; |
| 2275 |
} |
| 2276 |
|
| 2277 |
# Use the normal escaping |
| 2278 |
} else { |
| 2279 |
$dir =~ s/\%u/${safename}/g; |
| 2280 |
$dir =~ s/\%l/${localpart}/g; |
| 2281 |
$dir =~ s/\%d/${domain}/g; |
| 2282 |
$dir =~ s/\%\%/\%/g; |
| 2283 |
|
| 2284 |
$userdir = $dir; |
| 2285 |
$prefsfile = $dir . '/user_prefs'; |
| 2286 |
} |
| 2267 |
|
2287 |
|
| 2268 |
# Log that the default configuration is being used for a user. |
2288 |
# Log that the default configuration is being used for a user. |
| 2269 |
info("spamd: using default config for $username: $prefsfile"); |
2289 |
info("spamd: using default config for $username: $prefsfile"); |
