Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 11

pykolab.spec Changed

@@ -28,17 +28,17 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.1
-Release:            2%{?dist}
+Version:            0.8.3
+Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
-Source0:            pykolab-0.8.1.tar.gz
+Source0:            pykolab-0.8.2.tar.gz
 Source1:            pykolab.logrotate
 
-Patch0001:          0001-Use-the-correct-constants-import-and-__version__-val.patch
-Patch0002:          0002-ID-directly-after-authentication-before-asking-for-a.patch
+Patch0001:          pykolab-0.8-patch-out-manticore.patch
+Patch0002:          0001-Call-the-correct-functions.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -232,7 +232,10 @@
 %prep
 %setup -q
 
+%if 0%{?kolab_enterprise}
 %patch0001 -p1
+%endif
+
 %patch0002 -p1
 
 %build
@@ -281,6 +284,10 @@
 %fdupes %{buildroot}/%{python_sitelib}
 %endif
 
+%if 0%{?kolab_enterprise}
+rm -rf %{buildroot}%{python_sitelib}/pykolab/setup/setup_manticore.py*
+%endif
+
 %pre
 # Add the kolab user and group accounts
 getent group %{kolab_group} &>/dev/null || groupadd -r %{kolab_group} -g %{kolab_group_id} &>/dev/null
@@ -560,6 +567,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Fri Jul 22 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.3-1
+- Release of version 0.8.3
+
 * Wed Mar 09 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.1-2
 - wallace requires python-gnupg to be installed. avoid ImportError: No module named gnupg

0001-Call-the-correct-functions.patch Added

@@ -0,0 +1,33 @@
+From 8e7ae3827770acf071eaea187f017d099d210e95 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Fri, 8 Jul 2016 13:16:55 +0200
+Subject: PATCH Call the correct functions
+
+---
+ kolabd/__init__.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py
+index 9629836..a5869d5 100644
+--- a/kolabd/__init__.py
++++ b/kolabd/__init__.py
+@@ -285,7 +285,7 @@ class KolabDaemon(object):
+ 
+             for primary in primaries:
+                 naming_context = primary_auth.domain_naming_context(primary)
+-                domain_root_dn = primary_auth.domain_root_dn(primary)
++                domain_root_dn = primary_auth._auth._kolab_domain_root_dn(primary)
+                 log.debug(
+                         _("Domain %r naming context: %r, root dn: %r") % (
+                                 primary,
+@@ -307,7 +307,6 @@ class KolabDaemon(object):
+ 
+             # Find however many naming contexts we have, and what the
+             # corresponding domain name is for them.
+-            naming_contexts = list(set(naming_contexts.values()))
+             primary_domains = x for x,y in naming_contexts.iteritems() if domain_root_dnsx == y
+ 
+             # Now we can check if any changes happened.
+-- 
+2.7.4
+

0001-Use-the-correct-constants-import-and-__version__-val.patch Deleted

@@ -1,35 +0,0 @@
-From f251c62827c1696dd2e0369800c82cc569c57011 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Fri, 1 Jul 2016 16:31:50 +0200
-Subject: PATCH 1/2 Use the correct constants import and __version__ value
- from it
-
----
- pykolab/imap/cyrus.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
-index 63b0615..2057a38 100644
---- a/pykolab/imap/cyrus.py
-+++ b/pykolab/imap/cyrus.py
-@@ -25,7 +25,7 @@ from urlparse import urlparse
- 
- import pykolab
- 
--from pykolab.constants import *
-+from pykolab import constants
- from pykolab.imap import IMAP
- from pykolab.translate import _
- 
-@@ -278,7 +278,7 @@ class Cyrus(cyruslib.CYRUS):
- 
-     def _id(self, identity=None):
-         if identity is None:
--            identity = '("name" "Python/Kolab" "version" "%s")' % (__version__)
-+            identity = '("name" "Python/Kolab" "version" "%s")' % (constants.__version__)
- 
-         typ, dat = self.m._simple_command('ID', identity)
-         res, dat = self.m._untagged_response(typ, dat, 'ID')
--- 
-2.5.5
-

0002-ID-directly-after-authentication-before-asking-for-a.patch Deleted

@@ -1,80 +0,0 @@
-From 132ea08148dfb903af3bffa1a2f74c7145a6e504 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Mon, 4 Jul 2016 09:36:48 +0200
-Subject: PATCH 2/2 ID directly after authentication, before asking for admin
- or hierarchy separators
-
----
- cyruslib.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/cyruslib.py b/cyruslib.py
-index 3802c00..9e42f39 100644
---- a/cyruslib.py
-+++ b/cyruslib.py
-@@ -130,7 +130,7 @@ class IMAP4(imaplib.IMAP4):
- 
-     def id(self):
-         try:
--            typ, dat = self._simple_command('ID', 'NIL')
-+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
-             res, dat = self._untagged_response(typ, dat, 'ID')
-         except:
-             return False, dat0
-@@ -211,7 +211,7 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
- 
-     def id(self):
-         try:
--            typ, dat = self._simple_command('ID', 'NIL')
-+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
-             res, dat = self._untagged_response(typ, dat, 'ID')
-         except:
-             return False, dat0
-@@ -275,6 +275,7 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
-             encoded = b2a_base64("%s\0%s\0%s" % (admin, admin, password)).strip()
- 
-         res, data = self._simple_command('AUTHENTICATE', 'PLAIN', encoded)
-+        self.AUTH = True
-         if ok(res):
-             self.state = 'AUTH'
-         return res, data
-@@ -409,8 +410,11 @@ class CYRUS:
-             self.__doexception("LOGIN", self.ERROR.get("AUTH")1)
-         try:
-             res, msg = self.m.login(username, password)
-+            self.AUTH = True
-+            self.id()
-             admin = self.m.isadmin()
-         except Exception, info:
-+            self.AUTH = False
-             error = str(info).split(':').pop().strip()
-             self.__doexception("LOGIN", error)
- 
-@@ -418,7 +422,6 @@ class CYRUS:
-             self.ADMIN = username
- 
-         self.SEP = self.m.getsep()
--        self.AUTH = True
-         self.__verbose( 'LOGIN %s %s: %s' % (username, res, msg0) )
- 
-     def login_plain(self, username, password, asUser = None):
-@@ -430,6 +433,8 @@ class CYRUS:
-         self.__verbose( 'AUTHENTICATE PLAIN %s %s: %s' % (username, res, msg0) )
- 
-         if ok(res):
-+            self.AUTH = True
-+            self.id()
-             if asUser is None:
-                 if self.m.isadmin():
-                     self.ADMIN = admin
-@@ -437,7 +442,6 @@ class CYRUS:
-                 self.ADMIN = asUser
-                 self.AUSER = asUser
-             self.SEP = self.m.getsep()
--            self.AUTH = True
- 
-     def logout(self):
-         try:
--- 
-2.5.5
-

pykolab-0.8-patch-out-manticore.patch Added

debian.changelog Changed

@@ -1,3 +1,15 @@
+pykolab (0.8.3-0~kolab1) unstable; urgency=low
+
+  * Upstream release of version 0.8.3
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 22 Jul 2016 01:49:00 +0100
+
+pykolab (0.8.2-0~kolab1) unstable; urgency=low
+
+  * Release of 0.8.2
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  7 Jul 2016 01:49:00 +0100
+
 pykolab (0.8.1-0~kolab1) unstable; urgency=low
 
   * Fix setup
@@ -32,7 +44,7 @@
 
   * Leave changes related to #4459 in, dpkg-source cannot deal with them
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, Jun 08 2015 17:30:46 +0200
+ -- Christoph Wickert <wickert@kolabsys.com>  Mon, 08 Jun 2015 17:30:46 +0200
 
 pykolab (0.7.14-0~kolab3) unstable; urgency=low
 
@@ -41,7 +53,7 @@
   * Fix lock check after changed in rP929e67a6
   * Make 'kolab sync' properly create mailboxes (#3975)
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, Jun 08 2015 16:42:47 +0200
+ -- Christoph Wickert <wickert@kolabsys.com>  Mon, 08 Jun 2015 16:42:47 +0200
 
 pykolab (0.7.14-0~kolab2) unstable; urgency=low

debian.control Changed

debian.series Changed

pykolab-0.8.1.tar.gz/.arclint -> pykolab-0.8.3.tar.gz/.arclint Changed

pykolab-0.8.1.tar.gz/conf/kolab.conf -> pykolab-0.8.3.tar.gz/conf/kolab.conf Changed

pykolab-0.8.1.tar.gz/configure.ac -> pykolab-0.8.3.tar.gz/configure.ac Changed

pykolab-0.8.1.tar.gz/cyruslib.py -> pykolab-0.8.3.tar.gz/cyruslib.py Changed

@@ -130,7 +130,7 @@
 
     def id(self):
         try:
-            typ, dat = self._simple_command('ID', 'NIL')
+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
             res, dat = self._untagged_response(typ, dat, 'ID')
         except:
             return False, dat0
@@ -211,7 +211,7 @@
 
     def id(self):
         try:
-            typ, dat = self._simple_command('ID', 'NIL')
+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
             res, dat = self._untagged_response(typ, dat, 'ID')
         except:
             return False, dat0
@@ -275,6 +275,7 @@
             encoded = b2a_base64("%s\0%s\0%s" % (admin, admin, password)).strip()
 
         res, data = self._simple_command('AUTHENTICATE', 'PLAIN', encoded)
+        self.AUTH = True
         if ok(res):
             self.state = 'AUTH'
         return res, data
@@ -409,8 +410,11 @@
             self.__doexception("LOGIN", self.ERROR.get("AUTH")1)
         try:
             res, msg = self.m.login(username, password)
+            self.AUTH = True
+            self.id()
             admin = self.m.isadmin()
         except Exception, info:
+            self.AUTH = False
             error = str(info).split(':').pop().strip()
             self.__doexception("LOGIN", error)
 
@@ -418,7 +422,6 @@
             self.ADMIN = username
 
         self.SEP = self.m.getsep()
-        self.AUTH = True
         self.__verbose( 'LOGIN %s %s: %s' % (username, res, msg0) )
 
     def login_plain(self, username, password, asUser = None):
@@ -430,6 +433,8 @@
         self.__verbose( 'AUTHENTICATE PLAIN %s %s: %s' % (username, res, msg0) )
 
         if ok(res):
+            self.AUTH = True
+            self.id()
             if asUser is None:
                 if self.m.isadmin():
                     self.ADMIN = admin
@@ -437,7 +442,6 @@
                 self.ADMIN = asUser
                 self.AUSER = asUser
             self.SEP = self.m.getsep()
-            self.AUTH = True
 
     def logout(self):
         try:

pykolab-0.8.1.tar.gz/kolabd/__init__.py -> pykolab-0.8.3.tar.gz/kolabd/__init__.py Changed

@@ -268,21 +268,46 @@
                 time.sleep(5)
                 continue
 
-            # domains now is a list of tuples in the format of
-            # ('primary',secondaries), we want the primary_domains
-            domain_base_dns = 
-            primary_domains = 
-            for primary_domain in list(set(domains.values())):
-                domain_base_dn = primary_auth.domain_naming_context(primary_domain)
-                log.debug(_("Domain Base DN for domain %r is %r") % (primary_domain, domain_base_dn), level=8)
-
-                if domain_base_dn is not None:
-                    if domain_base_dn not in domain_base_dns:
-                        domain_base_dns.append(domain_base_dn)
-                        primary_domain = primary_auth.primary_domain_for_naming_context(domain_base_dn)
-                        primary_domains.append(primary_domain)
-
-            log.debug(_("Naming contexts to synchronize: %r") % (primary_domains), level=8)
+            # domains now is a list of key-valye pairs in the format of
+            # {'secondary': 'primary'}, we want the primaries
+            primaries = list(set(domains.values()))
+
+            # Store the naming contexts for the domains as
+            #
+            #   {'domain': 'naming context'}
+            #
+            # and the domain root dns as
+            #
+            #   {'domain': 'domain root dn'}
+            #
+            domain_root_dns = {}
+            naming_contexts = {}
+
+            for primary in primaries:
+                naming_context = primary_auth.domain_naming_context(primary)
+                domain_root_dn = primary_auth._auth._kolab_domain_root_dn(primary)
+                log.debug(
+                        _("Domain %r naming context: %r, root dn: %r") % (
+                                primary,
+                                naming_context,
+                                domain_root_dn
+                            ),
+                        level=8
+                    )
+
+                domain_root_dnsprimary = domain_root_dn
+                naming_contextsprimary = naming_context
+
+            log.debug(
+                    _("Naming contexts to synchronize: %r") % (
+                            list(set(naming_contexts.values()))
+                        ),
+                    level=8
+                )
+
+            # Find however many naming contexts we have, and what the
+            # corresponding domain name is for them.
+            primary_domains = x for x,y in naming_contexts.iteritems() if domain_root_dnsx == y
 
             # Now we can check if any changes happened.
             added_domains = 
@@ -292,7 +317,7 @@
             # accounted for locally.
             all_domains = list(set(primary_domains + domain_auth.keys()))
 
-            log.debug(_("All naming contexts: %r") % (all_domains), level=8)
+            log.debug(_("Result set of domains: %r") % (all_domains), level=8)
 
             for domain in all_domains:
                 log.debug(_("Checking for domain %s") % (domain), level=8)

pykolab-0.8.1.tar.gz/po/POTFILES.in -> pykolab-0.8.3.tar.gz/po/POTFILES.in Changed

@@ -27,6 +27,7 @@
 pykolab/cli/cmd_add_domain.py
 pykolab/cli/cmd_add_user.py
 pykolab/cli/cmd_add_user_subscription.py
+pykolab/cli/cmd_check_quota.py
 pykolab/cli/cmd_count_domain_mailboxes.py
 pykolab/cli/cmd_create_mailbox.py
 pykolab/cli/cmd_delete_domain.py
@@ -82,6 +83,7 @@
 pykolab/constants.py.in
 pykolab/errors.py
 pykolab/imap/cyrus.py
+pykolab/imap/dovecot.py
 pykolab/imap/__init__.py
 pykolab/imap_utf7.py
 pykolab/__init__.py
@@ -96,9 +98,11 @@
 pykolab/setup/components.py
 pykolab/setup/__init__.py
 pykolab/setup/setup_freebusy.py
+pykolab/setup/setup_guam.py
 pykolab/setup/setup_imap.py
 pykolab/setup/setup_kolabd.py
 pykolab/setup/setup_ldap.py
+pykolab/setup/setup_manticore.py
 pykolab/setup/setup_mta.py
 pykolab/setup/setup_mysql.py
 pykolab/setup/setup_php.py
@@ -114,6 +118,7 @@
 pykolab/xml/contact_reference.py
 pykolab/xml/event.py
 pykolab/xml/__init__.py
+pykolab/xml/note.py
 pykolab/xml/recurrence_rule.py
 pykolab/xml/todo.py
 pykolab/xml/utils.py
@@ -173,6 +178,12 @@
 tests/unit/test-014-conf-and-raw.py
 tests/unit/test-015-translate.py
 tests/unit/test-016-todo.py
+tests/unit/test-017-diff.py
+tests/unit/test-018-note.py
+tests/unit/test-019-contact.py
+tests/unit/test-020-auth_cache.py
+tests/unit/test-022-utils.py
+tests/unit/test-030-recipientpolicy.py
 test-wallace.py
 ucs/kolab_sieve.py
 ucs/listener.py

pykolab-0.8.1.tar.gz/po/de.po -> pykolab-0.8.3.tar.gz/po/de.po Changed

@@ -6,412 +6,448 @@
 # Christoph Wickert <christoph.wickert@gmail.com>, 2015
 # Christoph Wickert <christoph.wickert@gmail.com>, 2011
 # Dirk Marschner <info@marschner.cx>, 2015
-# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
+# Dirk Marschner <info@marschner.cx>, 2015
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2016
+# Gerd Seyfarth <mail@netsecond.net>, 2015
 # Torsten Grote <grote@kolabsys.com>, 2012
 # Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2015
 # balin <johannes_graumann@web.de>, 2012
 # Jo <jo@caj-augsburg.de>, 2012
+# Inperpetuammemoriam, 2016
 # bitnukl, 2014
-# Thomas Brüderli <roundcube@gmail.com>, 2014
+# Thomas Bruederli <roundcube@gmail.com>, 2014
 # Till Savekoul <till@koul.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-02-01 15:31+0000\n"
-"Last-Translator: Dirk Marschner <info@marschner.cx>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (http://www.transifex.com/kolab/kolab/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Füge Richtlinien-Anfrage zu Instanz %s hinzu"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Unberechtigter Zugriff nicht erlaubt"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Konnte den Empfänger nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr "Konnte Absender-Umschlag für Benutzer %s nicht finden (511)"
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr "Erhaltene Details des authentifizieren Benutzers %r: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr "Konnte den Absender-Umschlag für den Benutzer %s nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "Benutzer %s ist nicht berechtigt als Benutzer %s zu senden"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr "Benutzer %s versuchte die Absendeadresse %s ohne Berechtigung zu verwenden"
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Benutzer %s ist ein delegierter Benutzer von %s"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr "Überprüfe authentisierten Absender '%(sender)s' mit SASL-Benutzernamen '%(sasl_username)s' für Empfänger '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr "Überprüfe unauthentisierten Absender '%(sender)s' für Empfänger '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr "Reproduziere verify_recipient(%s, %s) aus Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr "Authentisierungsdomain %s anstelle von %s wird verwendet"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Die Domain %s ist die primäre Domain"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr "Überprüfe Empfänger für fremde Domäne %s. Dies ist wahrscheinlich ein Konfigurationsfehler."
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr "Diese Empfänger-Adresse bezieht sich auf mehrere Objekt-Einträge. Die SMTP Access Policy kann deshalb den Nachrichtenfluss nicht einschränken."
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr "Emfänger-Adresse %r nicht gefunden. Erlauben, da MTA konfiguriert wurde, diesen Empfänger zu akzeptieren."
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Ungültiger Empfänger"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr "Konnte keine Einschränkung für diesen Benutzer finden, akzeptiere Nachricht"
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr "Absender %s darf nicht an Empfänger %s senden"
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr "Reproduziere verify_sender(%r) aus Cache"
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr "Nicht überprüfbarer Absender."
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr "Absender nutzt keinen Alias"
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Absender nutzt unerlaubte Absender-Umschlag Adresse"
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Konnte den Absender nicht verifizieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr "Überprüfe ob Absender an Empfänger gemäß Absender-Richtlinie senden darf"
 
-#: ../bin/kolab_smtp_access_policy.py:1106

pykolab-0.8.1.tar.gz/po/de_DE.po -> pykolab-0.8.3.tar.gz/po/de_DE.po Changed

@@ -3,779 +3,909 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christoph Wickert <christoph.wickert@gmail.com>, 2015
-# Christoph Wickert <christoph.wickert@gmail.com>, 2011
-# Dirk Marschner <info@marschner.cx>, 2015
-# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
+# Christoph Wickert <christoph.wickert@gmail.com>, 2012
 # Torsten Grote <grote@kolabsys.com>, 2012
-# Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2015
-# balin <johannes_graumann@web.de>, 2012
-# Jo <jo@caj-augsburg.de>, 2012
-# bitnukl, 2014
-# Thomas Brüderli <roundcube@gmail.com>, 2014
-# Till Savekoul <till@koul.de>, 2012
+# Thomas Bruederli <roundcube@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-02-01 15:31+0000\n"
-"Last-Translator: Dirk Marschner <info@marschner.cx>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/kolab/language/de/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: German (Germany) (http://www.transifex.com/kolab/kolab/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
+"Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Füge Richtlinien-Anfrage zu Instanz %s hinzu"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Unberechtigter Zugriff nicht erlaubt"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Konnte den Empfänger nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
-msgstr "Konnte Absender-Umschlag für Benutzer %s nicht finden (511)"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
-msgstr "Erhaltene Details des authentifizieren Benutzers %r: %r"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr "Konnte den Absender-Umschlag für den Benutzer %s nicht finden"
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "Benutzer %s ist nicht berechtigt als Benutzer %s zu senden"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
-msgstr "Benutzer %s versuchte die Absendeadresse %s ohne Berechtigung zu verwenden"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Benutzer %s ist ein delegierter Benutzer von %s"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
-msgstr "Überprüfe authentisierten Absender '%(sender)s' mit SASL-Benutzernamen '%(sasl_username)s' für Empfänger '%(recipient)s'"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
-msgstr "Überprüfe unauthentisierten Absender '%(sender)s' für Empfänger '%(recipient)s'"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
-msgstr "Reproduziere verify_recipient(%s, %s) aus Cache"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
-msgstr "Authentisierungsdomain %s anstelle von %s wird verwendet"
+msgstr "Benutze Authentisierungsdomain %s anstelle von %s"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Die Domain %s ist die primäre Domain"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
-msgstr "Überprüfe Empfänger für fremde Domäne %s. Dies ist wahrscheinlich ein Konfigurationsfehler."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
-msgstr "Diese Empfänger-Adresse bezieht sich auf mehrere Objekt-Einträge. Die SMTP Access Policy kann deshalb den Nachrichtenfluss nicht einschränken."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
-msgstr "Emfänger-Adresse %r nicht gefunden. Erlauben, da MTA konfiguriert wurde, diesen Empfänger zu akzeptieren."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Ungültiger Empfänger"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
-msgstr "Konnte keine Einschränkung für diesen Benutzer finden, akzeptiere Nachricht"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
-msgstr "Absender %s darf nicht an Empfänger %s senden"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
-msgstr "Reproduziere verify_sender(%r) aus Cache"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
-msgstr "Nicht überprüfbarer Absender."
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
-msgstr "Absender nutzt keinen Alias"
+msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069

pykolab-0.8.1.tar.gz/po/es.po -> pykolab-0.8.3.tar.gz/po/es.po Changed

@@ -8,400 +8,433 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-01-21 16:41+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/kolab/language/es/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/kolab/kolab/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "El acceso no autorizado no está permitido"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "No se ha podido encontrar el destinatario"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "El dominio %s es el dominio principal"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Destinatario no válido"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "No es posible verificar el remitente"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "El resultado es %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156

pykolab-0.8.1.tar.gz/po/fr.po -> pykolab-0.8.3.tar.gz/po/fr.po Changed

@@ -12,400 +12,433 @@
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-01-21 16:41+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/kolab/language/fr/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: French (http://www.transifex.com/kolab/kolab/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Ajoutant une demande politique au recours %s"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Accès non autorisé interdit"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Impossible de trouver le destinataire"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr "L'expéditeur d'enveloppe d'utilisateur %s (511) pas trouvé\n\n l'adresse mail expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr "Informations d'utilisateur authentifié obtenus pour %r: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr " Impossible de trouver l'enveloppe d'utilisateur d'expéditeur %s "
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "%s n'est pas autorisé d'envoyer de la part de %s"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr "L'utilisateur %s a tenté d'utilisé l'adresse mail expéditeur %s sans autorisation"
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Utilisateur %s trouvé à être un utilisateur délégué de %s"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr "Vérification authentifié d'utilisateur '%(sender)s' avec sasl_username '%(sasl_username)s' pour destinateur '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr "Vérification non authentifié d'utilisateur '%(sender)s' pour destinateur '%(recipient)s'"
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr "Reproduction vérifier_destinateur(%s, %s)  de cache "
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr "Utilisation d'un domaine authentifié  %s à la place de %s"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Domaine %s est un domaine primaire"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr "Vérification du destinateur de domaine %s qui nous appartient pas. Ceci est probablement une erreur de configuration."
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr "Cette adresse de destinateur est liée aux entrées d´ objet multiple et le Code d'Accès SMTP ne peut pas ainsi limiter le flux de message."
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr "Adresse de destinateur %r pas trouvée. Permettant depuis la configuration d'ATM pour accepter le destinateur."
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Destinataire  non valide"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr "Utilisateur pas troué, en acceptant"
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr "Expéditeur %s n'est pas autorisé d'envoyer au destinateur %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr "Reproduction vérifier_expéditeur(%r) de cache "
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr "Expéditeur non vérifiables"
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr "Expéditeur n'utilise pas un alias"
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Expéditeur utilise  une adresse mail expéditeur non autorisée"
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Impossible de vérifier l'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr "Verifie si l'expéditeur est autorisé d'envoyer au destinateur utilisant politique d'expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Résultat est %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Aucune restrictions politique de destinateur existe pour cet expéditeur"
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr "Une politique de destinateur à appliquer à cet expéditeur trouvée"
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156

pykolab-0.8.1.tar.gz/po/nl.po -> pykolab-0.8.3.tar.gz/po/nl.po Changed

@@ -4,405 +4,438 @@
 # 
 # Translators:
 # Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, 2012
-# Lazlo <transifex@lazlo.me>, 2013
+# Lazlo, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Groupware Solution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
-"PO-Revision-Date: 2015-01-21 16:41+0000\n"
-"Last-Translator: Thomas Brüderli <roundcube@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/kolab/language/nl/)\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
+"PO-Revision-Date: 2016-07-22 13:31+0000\n"
+"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/kolab/kolab/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr "Bezig policy verzoek toe te voegen aan %s"
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr "Niet geautoriseerde toegang niet toegestaan"
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr "Kan ontvanger niet vinden"
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr "Gebruikers details voor geauthentificeerde gebruiker %r verkregen: %r"
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr "Kan envelope zender gebruiker %s niet vinden"
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr "Het is %s niet toegestaan te versturen namens %s"
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr "Gebruiker %s heeft geprobeerd envelop afzender adres %s te gebruiken zonder autorisatie"
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr "Gebruiker %s als delegatie gebruiker van %s gevonden"
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
 "Verifying authenticated sender '%(sender)s' with sasl_username "
 "'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr "Gebruik authenticatie domein %s in plaats van %s"
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr "Domein %s is een primair domein"
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr "Ongeldige ontvanger"
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr "Kan deze gebruiker niet vinden, accepteren"
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr "Het is afzender %s niet toegestaan te versturen naar ontvanger %s"
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr "Verstuurder gebruikt een niet geauthorizeerd envelope zender adres"
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr "Kan de verstuurder niet verifieren"
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr "Het resultaat is %r"
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr "Er zijn geen ontvanger restricties voor deze afzender"
 
-#: ../bin/kolab_smtp_access_policy.py:1120

pykolab-0.8.1.tar.gz/po/pykolab.pot -> pykolab-0.8.3.tar.gz/po/pykolab.pot Changed

@@ -8,398 +8,432 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-11 11:46-0400\n"
+"POT-Creation-Date: 2016-07-22 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bin/kolab_smtp_access_policy.py:210
+#: ../bin/kolab_smtp_access_policy.py:214
 #, python-format
 msgid "Adding policy request to instance %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:480
+#: ../bin/kolab_smtp_access_policy.py:484
 msgid "Unauthorized access not allowed"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:509
-#: ../bin/kolab_smtp_access_policy.py:690
+#: ../bin/kolab_smtp_access_policy.py:513
+#: ../bin/kolab_smtp_access_policy.py:711
 msgid "Could not find recipient"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:528
+#: ../bin/kolab_smtp_access_policy.py:532
 #, python-format
 msgid "Could not find envelope sender user %s (511)"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:571
+#: ../bin/kolab_smtp_access_policy.py:575
 #, python-format
 msgid "Obtained authenticated user details for %r: %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:628
+#: ../bin/kolab_smtp_access_policy.py:633
 #, python-format
 msgid "Could not find envelope sender user %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:650
+#: ../bin/kolab_smtp_access_policy.py:666
+#: ../bin/kolab_smtp_access_policy.py:694
 #, python-format
 msgid "%s is unauthorized to send on behalf of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:660
+#: ../bin/kolab_smtp_access_policy.py:676
 #, python-format
 msgid ""
 "User %s attempted to use envelope sender address %s without authorization"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:714
-#: ../bin/kolab_smtp_access_policy.py:725
+#: ../bin/kolab_smtp_access_policy.py:736
+#: ../bin/kolab_smtp_access_policy.py:747
 #, python-format
 msgid "Found user %s to be a delegate user of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:749
+#: ../bin/kolab_smtp_access_policy.py:767
 #, python-format
 msgid ""
-"Verifying authenticated sender '%(sender)s' with sasl_username '%"
-"(sasl_username)s' for recipient '%(recipient)s'"
+"Verifying authenticated sender '%(sender)s' with sasl_username "
+"'%(sasl_username)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:752
+#: ../bin/kolab_smtp_access_policy.py:770
 #, python-format
 msgid ""
 "Verifying unauthenticated sender '%(sender)s' for recipient '%(recipient)s'"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:768
+#: ../bin/kolab_smtp_access_policy.py:786
 #, python-format
 msgid "Reproducing verify_recipient(%s, %s) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:805
+#: ../bin/kolab_smtp_access_policy.py:823
 #, python-format
 msgid "Using authentication domain %s instead of %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:815
+#: ../bin/kolab_smtp_access_policy.py:833
 #, python-format
 msgid "Domain %s is a primary domain"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:823
+#: ../bin/kolab_smtp_access_policy.py:841
 #, python-format
 msgid ""
 "Checking the recipient for domain %s that is not ours. This is probably a "
 "configuration error."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:838
+#: ../bin/kolab_smtp_access_policy.py:856
 msgid ""
 "This recipient address is related to multiple object entries and the SMTP "
 "Access Policy can therefore not restrict message flow"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:855
+#: ../bin/kolab_smtp_access_policy.py:873
 #, python-format
 msgid ""
 "Recipient address %r not found. Allowing since the MTA was configured to "
 "accept the recipient."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:891
+#: ../bin/kolab_smtp_access_policy.py:909
 msgid "Invalid recipient"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:902
+#: ../bin/kolab_smtp_access_policy.py:920
 msgid "Could not find this user, accepting"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:975
-#: ../bin/kolab_smtp_access_policy.py:1051
+#: ../bin/kolab_smtp_access_policy.py:993
+#: ../bin/kolab_smtp_access_policy.py:1070
 #, python-format
 msgid "Sender %s is not allowed to send to recipient %s"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1039
+#: ../bin/kolab_smtp_access_policy.py:1057
 #, python-format
 msgid "Reproducing verify_sender(%r) from cache"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1056
+#: ../bin/kolab_smtp_access_policy.py:1077
 msgid "Unverifiable sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1061
+#: ../bin/kolab_smtp_access_policy.py:1082
 msgid "Sender is not using an alias"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1069
+#: ../bin/kolab_smtp_access_policy.py:1090
 msgid "Sender uses unauthorized envelope sender address"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1086
+#: ../bin/kolab_smtp_access_policy.py:1107
 msgid "Could not verify sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1093
+#: ../bin/kolab_smtp_access_policy.py:1114
 msgid ""
 "Verifying whether sender is allowed to send to recipient using sender policy"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1106
+#: ../bin/kolab_smtp_access_policy.py:1127
 #, python-format
 msgid "Result is %r"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1111
+#: ../bin/kolab_smtp_access_policy.py:1132
 msgid "No recipient policy restrictions exist for this sender"
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1120
+#: ../bin/kolab_smtp_access_policy.py:1141
 msgid "Found a recipient policy to apply for this sender."
 msgstr ""
 
-#: ../bin/kolab_smtp_access_policy.py:1135
+#: ../bin/kolab_smtp_access_policy.py:1156
 #, python-format
 msgid "Sender %s not allowed to send to recipient %s"

pykolab-0.8.1.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.3.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -153,7 +153,7 @@
         except:
             pass
 
-        self.connect()
+        self.connect(immediate=True)
         self._bind()
 
         # See if we know a base_dn for the domain
@@ -161,7 +161,8 @@
 
         try:
             base_dn = auth_cache.get_entry(self.domain)
-        except:
+        except Exception, errmsg:
+            log.error(_("Authentication cache failed: %r") % (errmsg))
             pass
 
         if base_dn == None:
@@ -180,7 +181,10 @@
                 pass
 
         try:
-            user_filter = self.config_get_raw('user_filter') % ({'base_dn':base_dn})
+            user_filter = self.config_get_raw('user_filter') % (
+                    {'base_dn': base_dn}
+                )
+
         except TypeError, errmsg:
             user_filter = self.config_get_raw('user_filter')
 
@@ -196,12 +200,16 @@
 
         entry_dn = None
 
+        # Attempt to obtain an entry_dn from cache.
         try:
             entry_dn = auth_cache.get_entry(_filter)
-        except:
+        except Exception, errmsg:
+            log.error(_("Authentication cache failed: %r") % (errmsg))
             pass
 
-        if entry_dn == None:
+        retval = False
+
+        if entry_dn is None:
             _search = self.ldap.search_ext(
                     base_dn,
                     ldap.SCOPE_SUBTREE,
@@ -221,15 +229,95 @@
                 log.error(_("LDAP server unavailable: %r") % (errmsg))
                 log.error(_("%s") % (traceback.format_exc()))
                 self._disconnect()
+
                 return False
 
-            if len(_result_data) >= 1:
+            except Exception, errmsg:
+                log.error(_("Exception occurred: %r") % (errmsg))
+                log.error(_("%s") % (traceback.format_exc()))
+                self._disconnect()
+
+                return False
+
+            log.debug(
+                    _("Length of entries found: %r") % (
+                            len(_result_data)
+                        ),
+                    level=8
+                )
+
+            if len(_result_data) == 1:
                 (entry_dn, entry_attrs) = _result_data0
 
+            elif len(_result_data) > 1:
+                try:
+                    log.info(
+                            _("Authentication for %r failed " +
+                                "(multiple entries)") % (
+                                    login0
+                                )
+                        )
+                except:
+                    pass
+
+                self._disconnect()
+                return False
+
+            else:
+                try:
+                    log.info(
+                            _("Authentication for %r failed (no entry)") % (
+                                    login0
+                                )
+                        )
+                except:
+                    pass
+
+                self._disconnect()
+                return False
+
+            if entry_dn is None:
+                try:
+                    log.info(
+                            _("Authentication for %r failed (LDAP error?)") % (
+                                    login0
+                                )
+                        )
+                except:
+                    pass
+
+                self._disconnect()
+                return False
+
             try:
-                # Needs to be synchronous or succeeds and continues setting retval
-                # to True!!
+                # Needs to be synchronous or succeeds and continues setting
+                # retval to True!!
                 retval = self._bind(entry_dn, login1)
+
+                if retval:
+                    try:
+                        log.info(
+                                _("Authentication for %r succeeded") % (
+                                        login0
+                                    )
+                            )
+
+                    except:
+                        pass
+
+                else:
+                    try:
+                        log.info(
+                                _("Authentication for %r failed (error)") % (
+                                        login0
+                                    )
+                            )
+                    except:
+                        pass
+
+                    self._disconnect()
+                    return False
+
                 try:
                     auth_cache.set_entry(_filter, entry_dn)
                 except Exception, errmsg:
@@ -239,56 +327,92 @@
             except ldap.SERVER_DOWN, errmsg:
                 log.error(_("Authentication failed, LDAP server unavailable"))
                 self._disconnect()
-                pass
 
-            except:
+                return False
+
+            except Exception, errmsg:
                 try:
                     log.debug(
-                            _("Failed to authenticate as user %s") % (login0),
+                            _("Failed to authenticate as user %r") % (
+                                    login0
+                                ),
                             level=8
                         )
                 except:
                     pass
 
-                retval = False
+                self._disconnect()
+                return False
+
         else:
             try:
-                # Needs to be synchronous or succeeds and continues setting retval
-                # to True!!
+                # Needs to be synchronous or succeeds and continues setting
+                # retval to True!!
                 retval = self._bind(entry_dn, login1)
+
+                if retval:
+                    log.info(_("Authentication for %r succeeded") % (login0))
+                else:
+                    log.info(
+                            _("Authentication for %r failed (password)") % (
+                                    login0
+                                )
+                        )
+
+                    self._disconnect()
+                    return False
+
                 auth_cache.set_entry(_filter, entry_dn)
 
             except ldap.NO_SUCH_OBJECT, errmsg:
-                log.debug(_("Error occured, there is no such object: %r") % (errmsg), level=8)
+                log.debug(
+                        _("Error occured, there is no such object: %r") % (

pykolab-0.8.1.tar.gz/pykolab/imap/__init__.py -> pykolab-0.8.3.tar.gz/pykolab/imap/__init__.py Changed

pykolab-0.8.1.tar.gz/pykolab/imap/cyrus.py -> pykolab-0.8.3.tar.gz/pykolab/imap/cyrus.py Changed

pykolab-0.8.1.tar.gz/pykolab/xml/attendee.py -> pykolab-0.8.3.tar.gz/pykolab/xml/attendee.py Changed

pykolab-0.8.1.tar.gz/tests/functional/test_wallace/test_007_invitationpolicy.py -> pykolab-0.8.3.tar.gz/tests/functional/test_wallace/test_007_invitationpolicy.py Changed

pykolab-0.8.1.tar.gz/tests/unit/test-020-auth_cache.py -> pykolab-0.8.3.tar.gz/tests/unit/test-020-auth_cache.py Changed

pykolab-0.8.1.tar.gz/wallace/__init__.py -> pykolab-0.8.3.tar.gz/wallace/__init__.py Changed

pykolab.dsc Changed

@@ -2,7 +2,7 @@
 Source: pykolab
 Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace
 Architecture: all
-Version: 0.8.1-0~kolab1
+Version: 0.8.3-0~kolab1
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.kolab.org
@@ -28,8 +28,8 @@
                 python-icalendar,
                 python-minimal,
                 python-nose,
-                univention-config-dev | bash
-Package-List: 
+                univention-config-dev | bash (>= 1.0)
+Package-List:
  kolab-cli deb python optional
  kolab-conf deb python optional
  kolab-saslauthd deb python optional
@@ -38,6 +38,6 @@
  kolab-xml deb python optional
  pykolab deb python optional
  wallace deb python optional
-Files: 
- 00000000000000000000000000000000 0 pykolab-0.8.1.tar.gz
+Files:
+ 00000000000000000000000000000000 0 pykolab-0.8.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz