diff options
author | Simon Rettberg | 2015-05-04 17:41:53 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-05-04 17:41:53 +0200 |
commit | aca4b02aac50bb775fdcfca620e5dbd004ec3456 (patch) | |
tree | 7b212d7d3a6848f13ad178b03deac7bdfd2f023a | |
parent | Delete event log when adding first user (diff) | |
download | slx-admin-aca4b02aac50bb775fdcfca620e5dbd004ec3456.tar.gz slx-admin-aca4b02aac50bb775fdcfca620e5dbd004ec3456.tar.xz slx-admin-aca4b02aac50bb775fdcfca620e5dbd004ec3456.zip |
fix AD SSL
-rw-r--r-- | inc/configmodule/adauth.inc.php | 2 | ||||
-rw-r--r-- | modules/sysconfig/addmodule_adauth.inc.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/inc/configmodule/adauth.inc.php b/inc/configmodule/adauth.inc.php index f2e20e4a..998dcea1 100644 --- a/inc/configmodule/adauth.inc.php +++ b/inc/configmodule/adauth.inc.php @@ -14,7 +14,7 @@ class ConfigModule_AdAuth extends ConfigModule const VERSION = 1; private static $REQUIRED_FIELDS = array('server', 'searchbase', 'binddn'); - private static $OPTIONAL_FIELDS = array('bindpw', 'home'); + private static $OPTIONAL_FIELDS = array('bindpw', 'home', 'ssl', 'fingerprint'); protected function generateInternal($tgz, $parent) { diff --git a/modules/sysconfig/addmodule_adauth.inc.php b/modules/sysconfig/addmodule_adauth.inc.php index 8d53601b..f293c2e4 100644 --- a/modules/sysconfig/addmodule_adauth.inc.php +++ b/modules/sysconfig/addmodule_adauth.inc.php @@ -73,6 +73,7 @@ class AdAuth_CheckConnection extends AddModule_Base protected function renderInternal() { $data = array( + 'edit' => Request::post('edit'), 'title' => Request::post('title'), 'server' => Request::post('server'), 'searchbase' => Request::post('searchbase'), @@ -159,7 +160,7 @@ class AdAuth_CheckCredentials extends AddModule_Base 'binddn' => Request::post('binddn'), 'bindpw' => Request::post('bindpw'), 'home' => Request::post('home'), - 'ssl' => Request::post('ssl'), + 'ssl' => Request::post('ssl') === 'on', 'fingerprint' => Request::post('fingerprint'), 'originalbinddn' => $this->originalBindDn, 'step' => 'AdAuth_Finish' |