2 commits - share/templates

Daniel Hoffend hoffend at kolabsys.com
Sat Apr 11 11:39:44 CEST 2015


 share/templates/imapd.conf.tpl                             |    2 +-
 share/templates/roundcubemail/kolab_delegation.inc.php.tpl |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2cca820836c530518474b45d27441b4b4be9d923
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Sat Apr 11 11:38:48 2015 +0200

    take kolab_delegate_filter from the source package

diff --git a/share/templates/roundcubemail/kolab_delegation.inc.php.tpl b/share/templates/roundcubemail/kolab_delegation.inc.php.tpl
index 563534d..0688d8a 100644
--- a/share/templates/roundcubemail/kolab_delegation.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_delegation.inc.php.tpl
@@ -1,7 +1,7 @@
 <?php
     // This will overwrite defined LDAP filter
     // Note: LDAP addressbook defined for kolab_auth plugin is used
-    \$config['kolab_delegation_filter'] = '(|(objectClass=kolabInetOrgPerson)(objectclass=kolabsharedfolder))';
+    \$config['kolab_delegation_filter'] = '(|(objectClass=kolabInetOrgPerson)(&(objectclass=kolabsharedfolder)(kolabFolderType=mail)))';
 
     // Delegates field (from fieldmap configuration) to get delegates list
     // Note: This is a field name, not LDAP attribute name


commit 82a83120181510f8c7021bb878bb02e51250e7cf
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Sat Apr 11 11:34:00 2015 +0200

    Remove auxprop from default imapd configuration
    
    According to the documention auxprop is only used in combination with
    the local sasldb2 password file or other auxprop password plugins. Since
    saslauthd is taking care for all user related authentication auxprop is
    obsolete (in the kolab default setup).

diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl
index 194135e..6437949 100644
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -3,7 +3,7 @@ partition-default: /var/spool/imap
 admins: $admins
 sievedir: /var/lib/imap/sieve
 sendmail: /usr/sbin/sendmail
-sasl_pwcheck_method: auxprop saslauthd
+sasl_pwcheck_method: saslauthd
 sasl_mech_list: PLAIN LOGIN
 allowplaintext: no
 tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem




More information about the commits mailing list