char *mail_v[] = {NULL, NULL};
char *proxy_address_v[] = {NULL, NULL};
char *mail_nickname_v[] = {NULL, NULL};
- char *reportToOriginator_v[] = {NULL, NULL};
+ char *report_to_originator_v[] = {NULL, NULL};
char *address_book_v[] = {NULL, NULL};
char *legacy_exchange_dn_v[] = {NULL, NULL};
u_int groupTypeControl;
LK_ENTRY *group_base;
int group_count;
int MailDisabled = 0;
+ char search_filter[1024];
if(UseGroupUniversal)
groupTypeControl = ADS_GROUP_TYPE_UNIVERSAL_GROUP;
group_count = 0;
group_base = NULL;
- sprintf(filter, "(&(objectClass=user)(cn=%s))", after_group_name);
+ sprintf(search_filter, "(&(objectClass=user)(cn=%s))",
+ after_group_name);
attr_array[0] = "cn";
attr_array[1] = NULL;
- if ((rc = linklist_build(ldap_handle, dn_path, filter, attr_array,
- &group_base, &group_count,
+ if ((rc = linklist_build(ldap_handle, dn_path, search_filter,
+ attr_array, &group_base, &group_count,
LDAP_SCOPE_SUBTREE)) != 0)
{
com_err(whoami, 0, "Unable to process group %s : %s",
mail_nickname_v[0] = mail_nickname;
proxy_address_v[0] = proxy_address;
mail_v[0] = mail;
+ report_to_originator_v[0] = "TRUE";
+
ADD_ATTR("mailNickName", mail_nickname_v, LDAP_MOD_REPLACE);
ADD_ATTR("mail", mail_v, LDAP_MOD_REPLACE);
ADD_ATTR("proxyAddresses", proxy_address_v, LDAP_MOD_REPLACE);
+ ADD_ATTR("reportToOriginator", report_to_originator_v,
+ LDAP_MOD_REPLACE);
}
else
{
mail_v[0] = NULL;
legacy_exchange_dn_v[0] = NULL;
address_book_v[0] = NULL;
+ report_to_originator_v[0] = NULL;
ADD_ATTR("mailNickName", mail_nickname_v, LDAP_MOD_REPLACE);
ADD_ATTR("mail", mail_v, LDAP_MOD_REPLACE);
ADD_ATTR("proxyAddresses", proxy_address_v, LDAP_MOD_REPLACE);
ADD_ATTR("legacyExchangeDN", legacy_exchange_dn_v, LDAP_MOD_REPLACE);
ADD_ATTR("showInAddressBook", address_book_v, LDAP_MOD_REPLACE);
+ ADD_ATTR("reportToOriginator", report_to_originator_v,
+ LDAP_MOD_REPLACE);
}
}
else
char *mail_v[] = {NULL, NULL};
char *proxy_address_v[] = {NULL, NULL};
char *mail_nickname_v[] = {NULL, NULL};
- char *reportToOriginator_v[] = {NULL, NULL};
+ char *report_to_originator_v[] = {NULL, NULL};
char *address_book_v[] = {NULL, NULL};
char *legacy_exchange_dn_v[] = {NULL, NULL};
char groupTypeControlStr[80];
if(atoi(av[L_MAILLIST]) && !MailDisabled && email_isvalid(mail))
{
mail_nickname_v[0] = mail_nickname;
+ report_to_originator_v[0] = "TRUE";
+
ADD_ATTR("mailNickName", mail_nickname_v, LDAP_MOD_ADD);
+ ADD_ATTR("reportToOriginator", report_to_originator_v,
+ LDAP_MOD_ADD);
}
}
else
if (atoi(av[L_MAILLIST]) && !MailDisabled && email_isvalid(mail))
{
mail_nickname_v[0] = mail_nickname;
+ report_to_originator_v[0] = "TRUE";
+
ADD_ATTR("mailNickName", mail_nickname_v, LDAP_MOD_REPLACE);
+ ADD_ATTR("reportToOriginator", report_to_originator_v,
+ LDAP_MOD_REPLACE);
}
else
{
proxy_address_v[0] = NULL;
legacy_exchange_dn_v[0] = NULL;
address_book_v[0] = NULL;
+ report_to_originator_v[0] = NULL;
ADD_ATTR("mailNickName", mail_nickname_v, LDAP_MOD_REPLACE);
ADD_ATTR("proxyAddresses", proxy_address_v, LDAP_MOD_REPLACE);
ADD_ATTR("legacyExchangeDN", legacy_exchange_dn_v,
LDAP_MOD_REPLACE);
ADD_ATTR("showInAddressBook", address_book_v, LDAP_MOD_REPLACE);
+ ADD_ATTR("reportToOriginator", report_to_originator_v,
+ LDAP_MOD_REPLACE);
}
}
else
if (Exchange)
{
- if ((rc != LDAP_SUCCESS) && (rc == LDAP_ALREADY_EXISTS))
+
+ if ((rc != LDAP_SUCCESS) && (rc == LDAP_ALREADY_EXISTS) &&
+ !strcmp(group_ou, contact_ou) && email_isvalid(mail))
{
n = 0;
(*linklist_base) = NULL;
(*linklist_count) = 0;
sprintf(filter, "(sAMAccountName=%s%s)", group_name, group_suffix);
+ com_err(whoami, 0, "AD_GET_GROUP: samname is %s%s", group_name, group_suffix);
attr_array[0] = attribute;
attr_array[1] = NULL;