[tryton-debian-vcs] tryton-modules-ldap-authentication branch debian-jessie-3.2 updated. debian/3.2.1-1-5-g2216965

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=debian/3.2.1-1-5-g2216965

commit 22169659514207c801d29cbe7b30c81bb4b4e6cf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:40:11 2014 +0100

    Releasing debian version 3.2.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 090f629..8dcb1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-ldap-authentication (3.2.2-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Updating to Standards-Version: 3.9.6, no changes needed.
+  * Setting the branch in the watch file to the fixed version 3.2.
+  * Merging upstream version 3.2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 12 Nov 2014 13:40:11 +0100
+
 tryton-modules-ldap-authentication (3.2.1-1) unstable; urgency=medium
 
   * Updating signing key while using now plain .asc files instead of .pgp
commit dfe87e545aa1fbd7af8698b153a8b15598711c73
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:40:10 2014 +0100

    Merging upstream version 3.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 5688849..4de78b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-08-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 759c5cb..db5daed 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_ldap_authentication
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module to authenticate users through LDAP
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/res.py b/res.py
index 46e35ad..7744bb7 100644
--- a/res.py
+++ b/res.py
@@ -121,13 +121,14 @@ class User:
         with Transaction().set_user(0):
             connection, = Connection.search([], limit=1)
         try:
-            con = ldap.initialize(connection.uri)
+            con = ldap.initialize(connection.uri or '')
             if connection.active_directory:
                 con.set_option(ldap.OPT_REFERRALS, 0)
             if connection.secure == 'tls':
                 con.start_tls_s()
             if connection.bind_dn:
-                con.simple_bind_s(connection.bind_dn, connection.bind_pass)
+                con.simple_bind_s(connection.bind_dn or '',
+                    connection.bind_pass or '')
             [(dn, attrs)] = cls.ldap_search_user(login, con, connection,
                 attrs=[str(connection.auth_uid)])
             if password and con.simple_bind_s(dn, password):
diff --git a/tryton.cfg b/tryton.cfg
index ee842ee..c7b5751 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.1
+version=3.2.2
 depends:
     ir
     ldap_connection
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index b2a9a4a..25d52a5 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-ldap-authentication
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module to authenticate users through LDAP
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index f366a96..52f0210 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -9,9 +9,23 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./connection.py
+./connection.xml
 ./res.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
 ./tests/__init__.py
 ./tests/test_ldap_authentication.py
+./view/connection_form.xml
 locale/bg_BG.po
 locale/ca_ES.po
 locale/cs_CZ.po
-- 
tryton-modules-ldap-authentication