X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/52eb0084cadce77dcd116cbe471ff117248d802b..8ba156fa008adfd44895d02af2aa98d00b68aa00:/incremental/ldap/winad.c diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c index 780c74f1..cfe818cb 100755 --- a/incremental/ldap/winad.c +++ b/incremental/ldap/winad.c @@ -4005,10 +4005,6 @@ int contact_create(LDAP *ld, char *bind_path, char *user, char *group_ou) if(!strcmp(group_ou, contact_ou)) { ADD_ATTR("mailRoutingAddress", mail_routing_v, LDAP_MOD_ADD); - } - - if(!strcmp(group_ou, contact_ou)) - { ADD_ATTR("eduPersonPrincipalName", mail_routing_v, LDAP_MOD_ADD); } } @@ -4050,30 +4046,6 @@ int contact_create(LDAP *ld, char *bind_path, char *user, char *group_ou) } } - if ((rc != LDAP_SUCCESS) && (rc != LDAP_ALREADY_EXISTS)) - { - n = 0; - ADD_ATTR("cn", contact_v, LDAP_MOD_ADD); - - if(ActiveDirectory) - { - ADD_ATTR("objectClass", objectClass_v, LDAP_MOD_ADD); - } - else - { - ADD_ATTR("objectClass", objectClass_ldap_v, LDAP_MOD_ADD); - } - - ADD_ATTR("name", name_v, LDAP_MOD_ADD); - ADD_ATTR("displayName", name_v, LDAP_MOD_ADD); - ADD_ATTR("description", desc_v, LDAP_MOD_ADD); - mods[n] = NULL; - rc = ldap_add_ext_s(ld, new_dn, mods, NULL, NULL); - - for (i = 0; i < n; i++) - free(mods[i]); - } - if ((rc != LDAP_SUCCESS) && (rc != LDAP_ALREADY_EXISTS)) { com_err(whoami, 0, "Unable to create contact %s : %s",