Remove comment about site configurable setting in a place where we already made it...

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index fe830092701028dc7c3fd35added29a94ca64bdb..6851c805937bdf51006c4a0f419925b6885e9d3f 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -652,13 +652,14 @@ 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];
-               if (extract_email_addresses_from_ldap(CCC->ldap_dn, new_emailaddrs) == 0) {
-                       strcpy(CCC->user.emailaddrs, new_emailaddrs);
+               if (CtdlGetConfigInt("c_ldap_sync_email_addrs") > 0) {
+                       if (extract_email_addresses_from_ldap(CCC->ldap_dn, new_emailaddrs) == 0) {
+                               CtdlSetEmailAddressesForUser(CCC->user.fullname, new_emailaddrs);
+                       }
                }
        }
 #endif