diff options
| author | Simon Rettberg | 2016-02-11 18:06:03 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-02-11 18:06:03 +0100 |
| commit | 981c0859ffdef308087e8399762f19088006eb92 (patch) | |
| tree | 464302f5e6938af4760c9a0145563d52acfa0601 /inc | |
| parent | [adauth/ldapauth] Prevent non-string value (false) from being used as certifi... (diff) | |
| download | slx-admin-981c0859ffdef308087e8399762f19088006eb92.tar.gz slx-admin-981c0859ffdef308087e8399762f19088006eb92.tar.xz slx-admin-981c0859ffdef308087e8399762f19088006eb92.zip | |
[ad/ldap] Fallback to default ports if working on old config
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/configmodule/adauth.inc.php | 12 | ||||
| -rw-r--r-- | inc/configmodule/ldapauth.inc.php | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/inc/configmodule/adauth.inc.php b/inc/configmodule/adauth.inc.php index a8f5e88a..daca3fb0 100644 --- a/inc/configmodule/adauth.inc.php +++ b/inc/configmodule/adauth.inc.php @@ -20,9 +20,18 @@ class ConfigModule_AdAuth extends ConfigModule { Trigger::ldadp($this->id(), $parent); $config = $this->moduleData; + if (isset($config['certificate']) && !is_string($config['certificate'])) { + unset($config['certificate']); + } if (preg_match('/^([^\:]+)\:(\d+)$/', $config['server'], $out)) { $config['server'] = $out[1]; $config['adport'] = $out[2]; + } else { + if (isset($config['certificate'])) { + $config['adport'] = 636; + } else { + $config['adport'] = 389; + } } $config['parentTask'] = $parent; $config['failOnParentFail'] = false; @@ -30,9 +39,6 @@ class ConfigModule_AdAuth extends ConfigModule $config['proxyport'] = 3100 + $this->id(); $config['filename'] = $tgz; $config['moduleid'] = $this->id(); - if (isset($config['certificate']) && !is_string($config['certificate'])) { - unset($config['certificate']); - } return Taskmanager::submit('CreateLdapConfig', $config); } diff --git a/inc/configmodule/ldapauth.inc.php b/inc/configmodule/ldapauth.inc.php index d334a2f5..67b1997a 100644 --- a/inc/configmodule/ldapauth.inc.php +++ b/inc/configmodule/ldapauth.inc.php @@ -20,9 +20,18 @@ class ConfigModule_LdapAuth extends ConfigModule { Trigger::ldadp($this->id(), $parent); $config = $this->moduleData; + if (isset($config['certificate']) && !is_string($config['certificate'])) { + unset($config['certificate']); + } if (preg_match('/^([^\:]+)\:(\d+)$/', $config['server'], $out)) { $config['server'] = $out[1]; $config['adport'] = $out[2]; // sic! + } else { + if (isset($config['certificate'])) { + $config['adport'] = 636; + } else { + $config['adport'] = 389; + } } $config['parentTask'] = $parent; $config['failOnParentFail'] = false; @@ -31,9 +40,6 @@ class ConfigModule_LdapAuth extends ConfigModule $config['filename'] = $tgz; $config['moduleid'] = $this->id(); $config['plainldap'] = true; - if (isset($config['certificate']) && !is_string($config['certificate'])) { - unset($config['certificate']); - } return Taskmanager::submit('CreateLdapConfig', $config); } |