Build shared libmoira via libtool.

[moira.git] / incremental / winad / winad.c

diff --git a/incremental/winad/winad.c b/incremental/winad/winad.c
index 8da0b4df74e8358ec31b00924b49549ddc04c4ec..88d29083fb815d73202a5b6067f4b3bf2e1c37a3 100755 (executable)
--- a/incremental/winad/winad.c
+++ b/incremental/winad/winad.c
@@ -703,7 +703,7 @@ int main(int argc, char **argv)
 
       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;
@@ -771,7 +771,7 @@ void do_mcntmap(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
   
   if (rc = moira_connect())
     {
-      critical_alert("AD incremental",
+      critical_alert(whoami, "AD incremental",
                     "Error contacting Moira server : %s",
                     error_message(rc));
       return;
@@ -863,7 +863,7 @@ void do_container(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 
   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;
     }
@@ -1097,8 +1097,8 @@ void do_list(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 
       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;
         }
@@ -1323,7 +1323,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
     {
       if (rc = moira_connect())
         {
-          critical_alert("AD incremental",
+          critical_alert(whoami, "AD incremental",
                          "Error contacting Moira server : %s",
                          error_message(rc));
           return;
@@ -1431,7 +1431,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
        {
          if (rc = moira_connect())
            {
-             critical_alert("AD incremental",
+             critical_alert(whoami, "AD incremental",
                             "Error contacting Moira server : %s",
                             error_message(rc));
              return;
@@ -1511,7 +1511,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
         {
           if (rc = moira_connect())
             {
-              critical_alert("AD incremental", 
+              critical_alert(whoami, "AD incremental", 
                              "Error connection to Moira : %s",
                              error_message(rc));
               return;
@@ -1595,7 +1595,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
     {
       if (rc = moira_connect())
        {
-         critical_alert("AD incremental",
+         critical_alert(whoami, "AD incremental",
                         "Error contacting Moira server : %s",
                         error_message(rc));
          return;
@@ -1685,7 +1685,7 @@ void do_user(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 
       if (rc = moira_connect())
         {
-          critical_alert("AD incremental", 
+          critical_alert(whoami, "AD incremental", 
                          "Error connection to Moira : %s",
                          error_message(rc));
           return;
@@ -2191,7 +2191,7 @@ int check_winad(void)
     {
       if (i > 30)
         {
-          critical_alert("AD incremental",
+          critical_alert(whoami, "AD incremental",
                          "WINAD incremental failed (%s exists): %s",
                          STOP_FILE, tbl_buf);
           return(1);
@@ -4061,7 +4061,7 @@ int user_update(LDAP *ldap_handle, char *dn_path, char *user_name,
     {
       if (rc = moira_connect())
        {
-         critical_alert("AD incremental", 
+         critical_alert(whoami, "AD incremental", 
                         "Error contacting Moira server : %s",
                         error_message(rc));
          return;
@@ -5736,7 +5736,6 @@ int ad_get_group(LDAP *ldap_handle, char *dn_path,
   (*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;
 
@@ -7732,7 +7731,7 @@ int ReadDomainList()
 
   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);
     }
@@ -7850,6 +7849,7 @@ int find_homeMDB(LDAP *ldap_handle, char *dn_path, char **homeMDB,
       
       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;