Merge pull request #1313 from sobolev-es/1.2

endelwar · web-flow · commit bff307eb29c1 · 2025-02-03T13:17:42.000+01:00
diff --git a/mailscanner/functions.php b/mailscanner/functions.php
@@ -3051,6 +3051,9 @@ function ldap_authenticate($username, $password)
                 if (defined('LDAP_BIND_SUFFIX')) {
                     $user .= LDAP_BIND_SUFFIX;
                 }
+                if (!defined('LDAP_BIND_PREFIX') && !defined('LDAP_BIND_SUFFIX')) {
+                    $user=$result[0]['dn'];
+                }
 
                 if (!isset($result[0][LDAP_EMAIL_FIELD])) {
                     @trigger_error(__('ldapno03') . ' "' . LDAP_EMAIL_FIELD . '" ' . __('ldapresults03'));

Original file line number	Diff line number	Diff line change
`@@ -3051,6 +3051,9 @@ function ldap_authenticate($username, $password)`
`3051`	`3051`	`if (defined('LDAP_BIND_SUFFIX')) {`
`3052`	`3052`	`$user .= LDAP_BIND_SUFFIX;`
`3053`	`3053`	`}`
	`3054`	`+ if (!defined('LDAP_BIND_PREFIX') && !defined('LDAP_BIND_SUFFIX')) {`
	`3055`	`+ $user=$result[0]['dn'];`
	`3056`	`+ }`
`3054`	`3057`
`3055`	`3058`	`if (!isset($result[0][LDAP_EMAIL_FIELD])) {`
`3056`	`3059`	`@trigger_error(__('ldapno03') . ' "' . LDAP_EMAIL_FIELD . '" ' . __('ldapresults03'));`