0011190: can't activate TLS for LDAP connections
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 14:27:11 +0000 (16:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 15:10:10 +0000 (17:10 +0200)
* fixes "start tls" for LDAP auth and account backends

https://forge.tine20.org/view.php?id=11190

Change-Id: Iad423f8a115948e0dfc0303b42e911e60f3d89d9
Reviewed-on: http://gerrit.tine20.com/customers/2085
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
tine20/Setup/js/AuthenticationPanel.js
tine20/Tinebase/Auth.php
tine20/Tinebase/Ldap.php
tine20/Tinebase/User.php

index 93b1a0e..455b20f 100644 (file)
@@ -597,7 +597,7 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                 value: '1'
             }, commonComboConfig),
             Ext.applyIf({
-                name: 'accounts_' + type + 'useStartTls',
+                name: 'accounts_' + type + '_useStartTls',
                 fieldLabel: this.app.i18n._('Start TLS'),
                 store: [['0', this.app.i18n._('No')], ['1', this.app.i18n._('Yes')]],
                 value: '0'
index 390d40f..323ed1b 100755 (executable)
@@ -129,6 +129,7 @@ class Tinebase_Auth
             'username' => '',
             'password' => '',
             'bindRequiresDn' => true,
+            'useStartTls' => false,
             'baseDn' => '',
             'accountFilterFormat' => NULL,
             'accountCanonicalForm' => '2',
index 0c733a8..d8d7362 100644 (file)
@@ -50,6 +50,9 @@ class Tinebase_Ldap extends Zend_Ldap
         ));
         
         $returnValue = parent::__construct($options);
+
+        if (Tinebase_Core::isLogLevel(Zend_Log::TRACE)) Tinebase_Core::getLogger()->trace(__METHOD__ . '::' . __LINE__
+            . ' LDAP options: ' . print_r($options, true));
         
         return $returnValue;
     }
index f3afffa..0b7992c 100644 (file)
@@ -113,6 +113,7 @@ class Tinebase_User
             'username' => '',
             'password' => '',
             'bindRequiresDn' => true,
+            'useStartTls' => false,
             'useRfc2307bis' => false,
             'userDn' => '',
             'userFilter' => 'objectclass=posixaccount',