summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--inc/configmodule/adauth.inc.php2
-rw-r--r--modules/sysconfig/addmodule_adauth.inc.php3
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'