1 |
vip-ire |
1.1 |
diff -Nur smeserver-dovecot-1.4.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth smeserver-dovecot-1.4.0_bz8778/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth |
2 |
|
|
--- smeserver-dovecot-1.4.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth 2013-02-26 18:57:10.000000000 +0100 |
3 |
|
|
+++ smeserver-dovecot-1.4.0_bz8778/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth 2015-01-07 18:29:48.615000000 +0100 |
4 |
|
|
@@ -1,9 +1,11 @@ |
5 |
|
|
{ |
6 |
|
|
my $greeting = $dovecot{'Greeting'} || 'SME Server IMAP service powered by doveot'; |
7 |
|
|
$OUT .= "login_greeting = \"$greeting\"\n"; |
8 |
|
|
+our $args = $dovecot{PassDBArgs} || ''; |
9 |
|
|
} |
10 |
|
|
passdb \{ |
11 |
|
|
driver = pam |
12 |
|
|
+ { $OUT .= ($args ne '') ? "args = $args\n" : ''; } |
13 |
|
|
\} |
14 |
|
|
{ |
15 |
|
|
if (($dovecot{'AdminIsMaster'} || 'disabled') eq 'enabled'){ |
16 |
|
|
@@ -11,7 +13,7 @@ |
17 |
|
|
|
18 |
|
|
passdb { |
19 |
|
|
driver = pam |
20 |
|
|
- args = dovecotadmin |
21 |
|
|
+ args = $args dovecotadmin |
22 |
|
|
master = yes |
23 |
|
|
} |
24 |
|
|
auth_master_user_separator = * |