[tryton-debian-vcs] tryton-modules-ldap-authentication branch debian-wheezy-2.6 updated. debian/2.6.0-3-6-g7b9380f

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=debian/2.6.0-3-6-g7b9380f

commit 7b9380fa68809c824810c5199e726792e971df1f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:08:33 2014 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 2967d2a..5c6d95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-ldap-authentication (2.6.1-1) unstable; urgency=medium
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes:
+    #704383).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 04 Dec 2014 19:08:33 +0100
+
 tryton-modules-ldap-authentication (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 6b7027717d5c7606e5c7f454707fe12808a08d21
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:08:32 2014 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 8d908f7..3ad255b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2006-2012 Cédric Krier
+Copyright: 2006-2014 Cédric Krier
            2009-2012 Bertrand Chenal
-           2009-2012 B2CK SPRL
+           2009-2014 B2CK SPRL
            2008-2012 Udo Spallek
            2008-2011 virtual things
 License: GPL-3+
commit 3c63aa40221afc52f3434c08f0d6773fe8d6b709
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:08:32 2014 +0100

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 44487f6..153a03b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2c9cbcc..c7afa3f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2012 Cédric Krier.
+Copyright (C) 2006-2014 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2014 B2CK SPRL.
 Copyright (C) 2008-2012 Udo Spallek.
 Copyright (C) 2008-2011 virtual things.
 
diff --git a/PKG-INFO b/PKG-INFO
index 6e0036e..7bf8b8d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_ldap_authentication
-Version: 2.6.0
+Version: 2.6.1
 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 3256c55..474c50b 100644
--- a/res.py
+++ b/res.py
@@ -112,13 +112,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 1d4fd64..cd928b9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     ldap_connection
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 8ccca26..143be95 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-ldap-authentication
-Version: 2.6.0
+Version: 2.6.1
 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 a11304a..8c4230d 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -9,7 +9,19 @@ 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
 ./tests/__init__.py
 ./tests/test_ldap_authentication.py
 locale/bg_BG.po
-- 
tryton-modules-ldap-authentication