/[smeserver]/rpms/smeserver-dovecot/sme9/smeserver-dovecot-1.4.0-allow_custom_passdb_args.patch
ViewVC logotype

Annotation of /rpms/smeserver-dovecot/sme9/smeserver-dovecot-1.4.0-allow_custom_passdb_args.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Wed Jan 7 17:32:28 2015 UTC (9 years, 9 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-dovecot-1_4_0-17_el6_sme, smeserver-dovecot-1_4_0-21_el6_sme, smeserver-dovecot-1_4_0-19_el6_sme, smeserver-dovecot-1_4_0-20_el6_sme, smeserver-dovecot-1_4_0-18_el6_sme, HEAD
* Wed Jan 7 2015 Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-17.sme
- Allow custom passdb args [SME: 8778]

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 = *

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed