X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fldap.c;h=73e45ba23c2a777ee6072fe155b6a482c207edee;hp=904baf3897fb8e2f250cc79263b9cfc12ccbeb38;hb=8996a310a8255f702e139f09dbb7fae697ba7841;hpb=fcec795dc7d0d125028ca1bd3a5f35b3f97b265f diff --git a/citadel/ldap.c b/citadel/ldap.c index 904baf389..73e45ba23 100644 --- a/citadel/ldap.c +++ b/citadel/ldap.c @@ -611,13 +611,12 @@ void CtdlSynchronizeUsersFromLDAP(void) } if (found_user == 0) { // user record exists - // now update the account email addresses if necessary - // FIXME make this a site configurable setting - - if (extract_email_addresses_from_ldap(user_dn, new_emailaddrs) == 0) { - if (strcmp(usbuf.emailaddrs, new_emailaddrs)) { // update only if changed - CtdlSetEmailAddressesForUser(usbuf.fullname, new_emailaddrs); + if (CtdlGetConfigInt("c_ldap_sync_email_addrs") > 0) { + if (extract_email_addresses_from_ldap(user_dn, new_emailaddrs) == 0) { + if (strcmp(usbuf.emailaddrs, new_emailaddrs)) { // update only if changed + CtdlSetEmailAddressesForUser(usbuf.fullname, new_emailaddrs); + } } } }