From 08d532134b0c036ed06725267673ecc5605c4ce2 Mon Sep 17 00:00:00 2001
From: zacheiss <zacheiss>
Date: Tue, 1 Dec 2009 06:30:56 +0000
Subject: [PATCH] Don't revert critical_alert change.

---
 incremental/ldap/winad.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index 5aed4466..a922d14a 100755
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -757,7 +757,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;
@@ -826,7 +826,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;
@@ -918,7 +918,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;
     }
@@ -1156,7 +1156,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;
@@ -1386,7 +1386,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;
@@ -1496,7 +1496,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;
@@ -1586,7 +1586,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;
@@ -1662,7 +1662,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;
@@ -1758,7 +1758,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;
@@ -2266,7 +2266,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);
@@ -4287,7 +4287,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;
@@ -4630,7 +4630,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;
@@ -5476,7 +5476,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;
@@ -8445,7 +8445,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;
@@ -8516,7 +8516,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;
@@ -9038,7 +9038,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);
     }
-- 
2.45.1