summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_authservers.php
diff options
context:
space:
mode:
authorderelict-pf <cjl@netgate.com>2016-10-14 16:29:46 -0700
committerRenato Botelho <renato@netgate.com>2016-12-06 15:51:37 -0200
commit836c858f7a24825ed2fc84ac0e0d7ff8c0f3b397 (patch)
tree3713bb87edf9e301a937af0577a732b931277beb /src/usr/local/www/system_authservers.php
parent13622c260ee1ad82e66f278450a296c5d88d7a1b (diff)
downloadpfsense-836c858f7a24825ed2fc84ac0e0d7ff8c0f3b397.zip
pfsense-836c858f7a24825ed2fc84ac0e0d7ff8c0f3b397.tar.gz
Added STARTTLS to LDAP Auth Server Config
(cherry picked from commit d672403c250556ced61d6eec7c51f5518b5f8c6b)
Diffstat (limited to 'src/usr/local/www/system_authservers.php')
-rw-r--r--src/usr/local/www/system_authservers.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php
index c6a2b72..84f4f2a 100644
--- a/src/usr/local/www/system_authservers.php
+++ b/src/usr/local/www/system_authservers.php
@@ -541,7 +541,7 @@ $section->addInput(new Form_Input(
'Hostname or IP address',
'text',
$pconfig['ldap_host']
-))->setHelp('NOTE: When using SSL, this hostname MUST match the Common Name '.
+))->setHelp('NOTE: When using SSL or STARTTLS, this hostname MUST match the Common Name '.
'(CN) of the LDAP server\'s SSL Certificate.');
$section->addInput(new Form_Input(
@@ -576,7 +576,8 @@ else
'Peer Certificate Authority',
$pconfig['ldap_caref'],
$ldapCaRef
- ))->setHelp('This option is used if \'SSL Encrypted\' option is choosen. '.
+ ))->setHelp('This option is used if \'SSL Encrypted\' '.
+ 'or \'TCP - STARTTLS\' options are chosen. '.
'It must match with the CA in the AD otherwise problems will arise.');
}
@@ -912,10 +913,10 @@ events.push(function() {
}
function set_ldap_port() {
- if ($('#ldap_urltype').find(":selected").index() == 0)
- $('#ldap_port').val('389');
- else
+ if ($('#ldap_urltype').find(":selected").index() == 2)
$('#ldap_port').val('636');
+ else
+ $('#ldap_port').val('389');
}
// Hides all elements of the specified class. This will usually be a section
OpenPOWER on IntegriCloud