diff options
| -rw-r--r-- | pykolab/auth/ldap/__init__.py | 3 | ||||
| -rw-r--r-- | pykolab/plugins/recipientpolicy/__init__.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py index 0a564fa..1c41924 100644 --- a/pykolab/auth/ldap/__init__.py +++ b/pykolab/auth/ldap/__init__.py @@ -566,6 +566,9 @@ class LDAP(pykolab.base.Base): } ) + if primary_mail_address == None: + return entry_modifications + i = 1 _primary_mail = primary_mail_address diff --git a/pykolab/plugins/recipientpolicy/__init__.py b/pykolab/plugins/recipientpolicy/__init__.py index 8dff05e..8ea2c89 100644 --- a/pykolab/plugins/recipientpolicy/__init__.py +++ b/pykolab/plugins/recipientpolicy/__init__.py @@ -77,9 +77,10 @@ class KolabRecipientpolicy(object): return mail except KeyError, e: log.warning(_("Attribute substitution for 'mail' failed in Recipient Policy")) - mail = utils.translate(user_attrs['mail'], user_attrs['preferredlanguage']) - mail = mail.lower() - return mail + if user_attrs.has_key('mail'): + return mail + else: + return None def set_secondary_mail(self, *args, **kw): """ |