3CVS: ----------------------------------------------------------------------

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index 780c74f1b25c23f78fed968443e3261fa4391abd..cfe818cb0f847a129de2f737c15e204d51ab19c0 100755 (executable)
--- 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",