X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/02fe42131b13d6d891ff267849354288bc600bd5..a816420bb99d1bd3051bc633a1608cd84779a05b:/incremental/winad/winad.c

diff --git a/incremental/winad/winad.c b/incremental/winad/winad.c
index a7469ec6..88d29083 100755
--- 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;
@@ -7731,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);
     }