diff options
| author | Simon Rettberg | 2016-12-01 18:08:06 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-12-01 18:08:06 +0100 |
| commit | c485b29eb853c5a4a7e5b021de39269b1c00d4e2 (patch) | |
| tree | 2be43cabb747308de42ae460cf26850d55232b26 /modules-available/sysconfig/addmodule_adauth.inc.php | |
| parent | [Taskmanager] Add support for compressed replies (diff) | |
| download | slx-admin-c485b29eb853c5a4a7e5b021de39269b1c00d4e2.tar.gz slx-admin-c485b29eb853c5a4a7e5b021de39269b1c00d4e2.tar.xz slx-admin-c485b29eb853c5a4a7e5b021de39269b1c00d4e2.zip | |
[sysconfig] AD/LDAP: Fix handling of user@domain.foo; fix SSL portscan; add homeattr scan info
Diffstat (limited to 'modules-available/sysconfig/addmodule_adauth.inc.php')
| -rw-r--r-- | modules-available/sysconfig/addmodule_adauth.inc.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules-available/sysconfig/addmodule_adauth.inc.php b/modules-available/sysconfig/addmodule_adauth.inc.php index 238b7490..5f93e04b 100644 --- a/modules-available/sysconfig/addmodule_adauth.inc.php +++ b/modules-available/sysconfig/addmodule_adauth.inc.php @@ -25,7 +25,7 @@ class AdAuth_Start extends AddModule_Base if (!empty($obdn)) { $data['binddn'] = $obdn; } - if (preg_match('/^(.*)\:(636|3269|389|3268)$/', $data['server'], $out)) { + if (isset($data['server']) && preg_match('/^(.*)\:(636|3269|389|3268)$/', $data['server'], $out)) { $data['server'] = $out[1]; } $data['step'] = 'AdAuth_CheckConnection'; @@ -146,13 +146,11 @@ class AdAuth_SelfSearch extends AddModule_Base 'searchbase' => $searchbase, 'bindpw' => $bindpw, ); - error_log("'$binddn'"); - error_log(preg_match(AD_SHORT_REGEX, $binddn, $out)); - error_log(print_r($out, true)); if (preg_match(AD_SHORT_REGEX, $binddn, $out) && !empty($out[2])) { $this->originalBindDn = str_replace('/', '\\', $binddn); $taskData['filter'] = 'sAMAccountName=' . $out[2]; } elseif (preg_match(AD_AT_REGEX, $binddn, $out) && !empty($out[1])) { + $this->originalBindDn = $binddn; $taskData['filter'] = 'sAMAccountName=' . $out[1]; } elseif (preg_match('/^cn\=([^\=]+),.*?,dc\=([^\=]+),/i', Ldap::normalizeDn($binddn), $out)) { if (empty($searchbase)) { |