summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pykolab/cli/sieve/cmd_refresh.py4
-rw-r--r--pykolab/imap/__init__.py4
-rw-r--r--pykolab/plugins/sievemgmt/__init__.py4
-rw-r--r--pykolab/setup/setup_mta.py3
-rw-r--r--pykolab/setup/setup_roundcube.py1
-rw-r--r--share/templates/roundcubemail/main.inc.php.tpl2
-rwxr-xr-xucs/kolab_sieve.py1
7 files changed, 14 insertions, 5 deletions
diff --git a/pykolab/cli/sieve/cmd_refresh.py b/pykolab/cli/sieve/cmd_refresh.py
index 77eecc5..226fb93 100644
--- a/pykolab/cli/sieve/cmd_refresh.py
+++ b/pykolab/cli/sieve/cmd_refresh.py
@@ -258,7 +258,7 @@ def execute(*args, **kw):
mgmt_script.require(required_extension)
if vacation_active:
- if len(vacation_react_domains) > 0:
+ if not vacation_react_domains == None and len(vacation_react_domains) > 0:
mgmt_script.addfilter(
'vacation',
[('envelope', ':domain', ":is", "from", vacation_react_domains)],
@@ -275,7 +275,7 @@ def execute(*args, **kw):
]
)
- elif len(vacation_noreact_domains) > 0:
+ elif not vacation_noreact_domains == None and len(vacation_noreact_domains) > 0:
mgmt_script.addfilter(
'vacation',
[('not', ('envelope', ':domain', ":is", "from", vacation_noreact_domains))],
diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
index d0b7d08..1dcae4d 100644
--- a/pykolab/imap/__init__.py
+++ b/pykolab/imap/__init__.py
@@ -543,6 +543,10 @@ class IMAP(object):
"""
Check if a user mailbox exists.
"""
+ if not mailbox_base_name == mailbox_base_name.lower():
+ log.warning(_("Downcasing mailbox name %r") % (mailbox_base_name))
+ mailbox_base_name = mailbox_base_name.lower()
+
return self.has_folder('user%s%s' %(self.imap.separator, mailbox_base_name))
def user_mailbox_quota(self, mailbox_quota):
diff --git a/pykolab/plugins/sievemgmt/__init__.py b/pykolab/plugins/sievemgmt/__init__.py
index f341eae..1e22a47 100644
--- a/pykolab/plugins/sievemgmt/__init__.py
+++ b/pykolab/plugins/sievemgmt/__init__.py
@@ -271,7 +271,7 @@ class KolabSievemgmt(object):
mgmt_script.require(required_extension)
if vacation_active:
- if len(vacation_react_domains) > 0:
+ if not vacation_react_domains == None and len(vacation_react_domains) > 0:
mgmt_script.addfilter(
'vacation',
[('envelope', ':domain', ":is", "from", vacation_react_domains)],
@@ -288,7 +288,7 @@ class KolabSievemgmt(object):
]
)
- elif len(vacation_noreact_domains) > 0:
+ elif not vacation_noreact_domains == None and len(vacation_noreact_domains) > 0:
mgmt_script.addfilter(
'vacation',
[('not', ('envelope', ':domain', ":is", "from", vacation_noreact_domains))],
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 5c66f19..c02b024 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -198,6 +198,9 @@ result_attribute = mail
"transport_maps": "ldap:/etc/postfix/ldap/transport_maps.cf",
"virtual_alias_maps": "$alias_maps, ldap:/etc/postfix/ldap/virtual_alias_maps.cf, ldap:/etc/postfix/ldap/mailenabled_distgroups.cf, ldap:/etc/postfix/ldap/mailenabled_dynamic_distgroups.cf",
"smtpd_tls_auth_only": "yes",
+ "smtpd_sasl_auth_enable": "yes",
+ "smtpd_sender_login_maps": "$relay_recipient_maps",
+ "smtpd_sender_restrictions": "permit_mynetworks, reject_sender_login_mismatch",
"smtpd_recipient_restrictions": "permit_mynetworks, reject_unauth_pipelining, reject_rbl_client zen.spamhaus.org, reject_non_fqdn_recipient, reject_invalid_helo_hostname, reject_unknown_recipient_domain, reject_unauth_destination, check_policy_service unix:private/recipient_policy_incoming, permit",
"smtpd_sender_restrictions": "permit_mynetworks, check_policy_service unix:private/sender_policy_incoming",
"submission_recipient_restrictions": "check_policy_service unix:private/submission_policy, permit_sasl_authenticated, reject",
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index 5eed26c..1c1c60c 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -81,6 +81,7 @@ def execute(*args, **kw):
'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'),
'ldap_user_base_dn': conf.get('ldap', 'user_base_dn'),
'ldap_user_filter': conf.get('ldap', 'user_filter'),
+ 'primary_domain': conf.get('kolab','primary_domain'),
'mysql_uri': 'mysqli://roundcube:%s@localhost/roundcube' % (mysql_roundcube_password),
'conf': conf
}
diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl
index 89068ff..9e4d14f 100644
--- a/share/templates/roundcubemail/main.inc.php.tpl
+++ b/share/templates/roundcubemail/main.inc.php.tpl
@@ -195,7 +195,7 @@
\$rcmail_config['smtp_server'] = 'tls://localhost';
\$rcmail_config['session_domain'] = '';
\$rcmail_config['des_key'] = "$des_key";
- \$rcmail_config['username_domain'] = '';
+ \$rcmail_config['username_domain'] = '$primary_domain';
\$rcmail_config['mail_domain'] = '';
diff --git a/ucs/kolab_sieve.py b/ucs/kolab_sieve.py
index b6d0349..f2b8df0 100755
--- a/ucs/kolab_sieve.py
+++ b/ucs/kolab_sieve.py
@@ -134,6 +134,7 @@ def handler(*args, **kw):
# See if the mailserver_attribute exists
mailserver_attribute = conf.get('ldap', 'mailserver_attribute').lower()
+ result_attr = conf.get('cyrus-sasl', 'result_attribute').lower()
if mailserver_attribute == None:
log.error("Mail server attribute is not set")