From: zacheiss <zacheiss>
Date: Sun, 22 Mar 2009 01:42:12 +0000 (+0000)
Subject: More error message tweaking.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/b6e441c58819214d5b46a6679bc6be3efd900778

More error message tweaking.
---

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index d2c9140a..02bc6979 100755
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -5564,8 +5564,6 @@ int user_delete(LDAP *ldap_handle, char *dn_path,
 
   if (group_count != 1)
     {
-      com_err(whoami, 0, "Unable to find user %s in directory",
-              user_name);
       goto cleanup;
     }
   
@@ -5685,6 +5683,9 @@ static int illegalchars_ldap[] = {
 int check_string(char *s)
 {
   char  character;
+  char  *string;
+
+  string = s;
 
   for (; *s; s++)
     {
@@ -5698,7 +5699,7 @@ int check_string(char *s)
 	  if (illegalchars[(unsigned) character])
 	    {
 	      com_err(whoami, 0, "Found illegal char '%c' (%d) in string %s",
-		      character, (unsigned) character, s);
+		      character, (unsigned) character, string);
 	      return 0;
 	    }
 	}
@@ -5707,7 +5708,7 @@ int check_string(char *s)
 	  if (illegalchars_ldap[(unsigned) character])
 	    {
 	      com_err(whoami, 0, "Found illegal char '%c' (%d) in string %s",
-		      character, (unsigned) character, s);
+		      character, (unsigned) character, string);
 	      return 0;
 	    }
 	}