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

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index 24cc0b06..7520d048 100755
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -740,7 +740,7 @@ int main(int argc, char **argv)
 
       if ((rc) || (ldap_handle == NULL))
 	{
-  	  critical_alert("incremental",
+  	  critical_alert(whoami, "incremental",
 			 "ldap.incr cannot connect to any server in "
 			 "domain %s", DomainNames[k]);
 	  continue;
@@ -809,7 +809,7 @@ void do_mcntmap(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
   
   if (rc = moira_connect())
     {
-      critical_alert("Ldap incremental",
+      critical_alert(whoami, "Ldap incremental",
 		     "Error contacting Moira server : %s",
 		     error_message(rc));
       return;
@@ -901,7 +901,7 @@ void do_container(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 
   if (rc = moira_connect())
     {
-      critical_alert("Ldap incremental", "Error contacting Moira server : %s",
+      critical_alert(whoami, "Ldap incremental", "Error contacting Moira server : %s",
 		     error_message(rc));
       return;
     }
@@ -1135,7 +1135,7 @@ void do_list(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 
       if (rc = moira_connect())
         {
-          critical_alert("Ldap incremental",
+          critical_alert(whoami, "Ldap incremental",
                          "Error contacting Moira server : %s",
                          error_message(rc));
           return;
@@ -1361,7 +1361,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
     {
       if (rc = moira_connect())
         {
-          critical_alert("Ldap incremental",
+          critical_alert(whoami, "Ldap incremental",
                          "Error contacting Moira server : %s",
                          error_message(rc));
           return;
@@ -1469,7 +1469,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 	}
 
       if (rc = moira_connect()) {
-	critical_alert("Ldap incremental",
+	critical_alert(whoami, "Ldap incremental",
 		       "Error contacting Moira server : %s",
 		       error_message(rc));              
 	return;
@@ -1558,7 +1558,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
         {
           if (rc = moira_connect())
             {
-              critical_alert("Ldap incremental", 
+              critical_alert(whoami, "Ldap incremental", 
                              "Error connection to Moira : %s",
                              error_message(rc));
               return;
@@ -1634,7 +1634,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
     }
 
   if (rc = moira_connect()) {
-    critical_alert("Ldap incremental",
+    critical_alert(whoami, "Ldap incremental",
 		   "Error contacting Moira server : %s",
 		   error_message(rc));              
     return;
@@ -1729,7 +1729,7 @@ void do_user(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
 
       if (rc = moira_connect())
         {
-          critical_alert("Ldap incremental", 
+          critical_alert(whoami, "Ldap incremental", 
                          "Error connection to Moira : %s",
                          error_message(rc));
           return;
@@ -2236,7 +2236,7 @@ int check_winad(void)
     {
       if (i > 30)
         {
-          critical_alert("Ldap incremental",
+          critical_alert(whoami, "Ldap incremental",
                          "Ldap incremental failed (%s exists): %s",
                          STOP_FILE, tbl_buf);
           return(1);
@@ -4236,7 +4236,7 @@ int user_update(LDAP *ldap_handle, char *dn_path, char *user_name,
     {
       if (rc = moira_connect())
 	{
-	  critical_alert("Ldap incremental", 
+	  critical_alert(whoami, "Ldap incremental", 
 			 "Error contacting Moira server : %s",
 			 error_message(rc));
 	  return;
@@ -4493,7 +4493,7 @@ int user_update(LDAP *ldap_handle, char *dn_path, char *user_name,
     {
       if (rc = moira_connect())
 	{
-	  critical_alert("Ldap incremental", 
+	  critical_alert(whoami, "Ldap incremental", 
 			 "Error contacting Moira server : %s",
 			 error_message(rc));
 	  return;
@@ -5281,7 +5281,7 @@ int user_create(int ac, char **av, void *ptr)
     {
       if (rc = moira_connect())
 	{
-	  critical_alert("Ldap incremental", 
+	  critical_alert(whoami, "Ldap incremental", 
 			 "Error contacting Moira server : %s",
 			 error_message(rc));
 	  return;
@@ -8193,7 +8193,7 @@ int SetHomeDirectory(LDAP *ldap_handle, char *user_name,
     {
       if (rc = moira_connect())
 	{
-          critical_alert("Ldap incremental",
+          critical_alert(whoami, "Ldap incremental",
 			 "Error contacting Moira server : %s",
 			 error_message(rc));
 	  return;
@@ -8264,7 +8264,7 @@ int SetHomeDirectory(LDAP *ldap_handle, char *user_name,
     {
       if (rc = moira_connect())
 	{
-          critical_alert("Ldap incremental",
+          critical_alert(whoami, "Ldap incremental",
 			 "Error contacting Moira server : %s",
 			 error_message(rc));
 	  return;
@@ -8786,7 +8786,7 @@ int ReadDomainList()
 
   if (Count == 0)
     {
-      critical_alert("incremental", "%s", "ldap.incr cannot run due to a "
+      critical_alert(whoami, "incremental", "%s", "ldap.incr cannot run due to a "
 		     "configuration error in ldap.cfg");
       return(1);
     }