Fix #3207: LDAP mail lookup was looking for the 'email' attribute ins…

…tead of the 'mail' attribute.

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@2269 f5dc347c-c33d-0410-90a0-b07cc1902cb9

core/ldap_api.php

@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: ldap_api.php,v 1.11 2003-01-25 20:50:25 jlatour Exp $
+	# $Id: ldap_api.php,v 1.12 2003-10-24 12:44:26 jlatour Exp $
 	# --------------------------------------------------------
 
 	###########################################################################
@@ -58,7 +58,7 @@ function ldap_email_from_username( $p_username ) {
 		$t_ldap_root_dn			= config_get( 'ldap_root_dn' );
 
 	    $t_search_filter	= "(&$t_ldap_organization(uid=$p_username))";
-		$t_search_attrs		= array( 'uid', 'email', 'dn' );
+		$t_search_attrs		= array( 'uid', 'mail', 'dn' );
 	    $t_ds				= ldap_connect_bind();
 
 		$t_sr	= ldap_search( $t_ds, $t_ldap_root_dn, $t_search_filter, $t_search_attrs );
@@ -138,4 +138,4 @@ function ldap_authenticate( $p_user_id, $p_password ) {
 	# Change the user's password in the LDAP Directory
 
 
-?>
+?>

doc/ChangeLog

@@ -1,8 +1,9 @@
 Mantis ChangeLog
 
-2003.10.??  -  0.18.0??
+2003.10.??  -  0.18.0
 
- * Enh #3335: Added Estonian Language (thanks to Villem Vannas)
+ * Fix #3207: LDAP mail lookup was looking for the 'email' attribute instead of the 'mail' attribute.
+ * Enh #3335: Added Estonian Language (thanks to Villem Vannas).
  * Fix #3310: Sorting of projects in menu bar.
  * Fix #3330: "Required" fields on Account Profile page.
  * Fix #3333: Support PHPMailer v1.7x.