if ((rc) || (ldap_handle == NULL))
{
- critical_alert("incremental",
+ critical_alert(whoami, "incremental",
"winad.incr cannot connect to any server in "
"domain %s", DomainNames[k]);
continue;
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error contacting Moira server : %s",
error_message(rc));
return;
if (rc = moira_connect())
{
- critical_alert("AD incremental", "Error contacting Moira server : %s",
+ critical_alert(whoami, "AD incremental", "Error contacting Moira server : %s",
error_message(rc));
return;
}
if (rc = moira_connect())
{
- critical_alert("AD incremental",
- "Error contacting Moira server : %s",
+ critical_alert(whoami, "AD incremental",
+ "Error contactng Moira server : %s",
error_message(rc));
return;
}
{
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error contacting Moira server : %s",
error_message(rc));
return;
{
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error contacting Moira server : %s",
error_message(rc));
return;
{
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error connection to Moira : %s",
error_message(rc));
return;
{
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error contacting Moira server : %s",
error_message(rc));
return;
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error connection to Moira : %s",
error_message(rc));
return;
{
if (i > 30)
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"WINAD incremental failed (%s exists): %s",
STOP_FILE, tbl_buf);
return(1);
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;
{
if (rc = moira_connect())
{
- critical_alert("AD incremental",
+ critical_alert(whoami, "AD incremental",
"Error contacting Moira server : %s",
error_message(rc));
return;
if (Count == 0)
{
- critical_alert("incremental", "%s", "winad.incr cannot run due to a "
+ critical_alert(whoami, "incremental", "%s", "winad.incr cannot run due to a "
"configuration error in winad.cfg");
return(1);
}
gPtr = group_base;
while(gPtr) {
- if ((s = strstr(gPtr->dn, "Public")) != (char *) NULL)
- {
- gPtr = gPtr->next;
- continue;
- }
-
- if ((s = strstr(gPtr->dn, "msExchRestore=True")) != (char *) NULL)
+ if (((s = strstr(gPtr->dn, "Public")) != (char *) NULL) ||
+ ((s = strstr(gPtr->dn, "Reserve")) != (char *) NULL) ||
+ ((s = strstr(gPtr->dn, "Recovery")) != (char *) NULL))
{
gPtr = gPtr->next;
continue;