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);
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",
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);
}
while(gPtr) {
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;