More error message tweaking.

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index d2c9140a01043f2b1b3b78b02d6e707928abeef4..02bc697940174f705efa4e5ff929e9a41ee87f7c 100755 (executable)
--- 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;
            }
        }