Improved code for STARTTLS support to users_ldap

lp bug: https://launchpad.net/bugs/389033 fixed

bzr revid: ian@catalyst.net.nz-20110814210916-3tbvkxgb4x9lvvhs

addons/users_ldap/users_ldap.py

@@ -68,7 +68,11 @@ class CompanyLDAP(osv.osv):
 
         uri = 'ldap://%s:%d' % (conf['ldap_server'],
                                 conf['ldap_server_port'])
-        return ldap.initialize(uri)
+
+        connection = ldap.initialize(uri)
+        if conf['ldap_tls']:
+            connection.start_tls_s()
+        return connection
 
     def authenticate(self, conf, login, password):
         """
@@ -95,8 +99,6 @@ class CompanyLDAP(osv.osv):
             if results and len(results) == 1:
                 dn = results[0][0]
                 conn = self.connect(conf)
-                if conf['ldap_tls']:
-                    conn.start_tls_s()
                 conn.simple_bind_s(dn, password)
                 conn.unbind()
                 entry = results[0]
@@ -134,8 +136,6 @@ class CompanyLDAP(osv.osv):
         logger = logging.getLogger('orm.ldap')
         try:
             conn = self.connect(conf)
-            if conf['ldap_tls']:
-                conn.start_tls_s()
             conn.simple_bind_s(conf['ldap_binddn'] or '',
                                conf['ldap_password'] or '')
             results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE,

addons/users_ldap/users_ldap_view.xml

@@ -27,7 +27,6 @@
                             <field name="ldap_server"/>
                             <field name="ldap_server_port"/>
                             <field name="ldap_base"/>
-                            <field name="ldap_tls"/>
                         </tree>
                     </field>
                 </xpath>