X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=6851c805937bdf51006c4a0f419925b6885e9d3f;hb=d93eb617b45525ca350d4a35fe3aa98a3569abcf;hp=82f693a4ea0a83a1395818ea4688b248d24fd66b;hpb=5f2b9b3de88c662fa886ee3fc96a68fd5e52545f;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 82f693a4e..6851c8059 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -652,16 +652,17 @@ void do_login(void)
 
 	/*
 	 * If we are using LDAP authentication, extract the user's email addresses from the directory.
-	 * FIXME make this a site configurable setting
 	 */
-	#ifdef HAVE_LDAP
-		if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
-			char new_emailaddrs[512];
+#ifdef HAVE_LDAP
+	if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+		char new_emailaddrs[512];
+		if (CtdlGetConfigInt("c_ldap_sync_email_addrs") > 0) {
 			if (extract_email_addresses_from_ldap(CCC->ldap_dn, new_emailaddrs) == 0) {
-				strcpy(CCC->user.emailaddrs, new_emailaddrs);
+				CtdlSetEmailAddressesForUser(CCC->user.fullname, new_emailaddrs);
 			}
 		}
-	#endif
+	}
+#endif
 
 	/*
 	 * No email address for user?  Make one up.