From 61e01a4439814c891fbc4b91a9ff5dffa44fbaa0 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 13 Mar 2015 00:00:21 +0100 Subject: [PATCH] Fix SSL, TLS vs LDAPS, STARTTLS in the LDAP resource form --- application/forms/Config/Resource/LdapResourceForm.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php index 5ce0424a9..7f5cfa35d 100644 --- a/application/forms/Config/Resource/LdapResourceForm.php +++ b/application/forms/Config/Resource/LdapResourceForm.php @@ -66,12 +66,13 @@ class LdapResourceForm extends Form 'autosubmit' => true, 'label' => $this->translate('Connection'), 'description' => $this->translate( - 'The type of connection to use. Unencrypted (Plaintext) or encrypted (SSL, TLS).' + 'Whether to encrypt communication. Choose STARTTLS or LDAPS for encrypted communication or' + . ' Plaintext for unencrypted communication' ), 'multiOptions' => array( 'plaintext' => $this->translate('Plaintext'), - Connection::LDAPS => 'Secure Sockets Layer (SSL)', - Connection::STARTTLS => 'Transport Layer Security (TLS)' + Connection::LDAPS => 'LDAPS', + Connection::STARTTLS => 'STARTTLS' ) ) );