Fix think-o in error message.

[moira.git] / incremental / ldap / winad.c

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index adac4777656cdd4b84eb153c702d66a1a6395748..780c74f1b25c23f78fed968443e3261fa4391abd 100755 (executable)
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -1263,7 +1263,7 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
       if (!atoi(before[LM_EXTRA_ACTIVE]))
         {
           com_err(whoami, 0, 
-                 "Unable to add %s to group %s : group not active", 
+                 "Unable to remove %s from group %s : group not active", 
                  before[2], before[0]);
           return;
         }
@@ -3423,7 +3423,7 @@ int member_list_build(int ac, char **av, void *ptr)
   char      **call_args;
   char      *s;
   call_args = ptr;
-  
+
   strcpy(temp, av[ACE_NAME]);
 
   if (!check_string(temp))
@@ -3450,13 +3450,12 @@ int member_list_build(int ac, char **av, void *ptr)
              strcat(s, ".mit.edu");
            }
        }
-      
+
       if (!((int)call_args[3] & MOIRA_STRINGS))
         return(0);
-
+       
       if (contact_create((LDAP *)call_args[0], call_args[1], temp, contact_ou))
         return(0);
-
     }
   else if (!strcmp(av[ACE_TYPE], "LIST"))
     {
@@ -3485,7 +3484,8 @@ int member_list_build(int ac, char **av, void *ptr)
 
   while (linklist)
     {
-    if (!strcasecmp(temp, linklist->member))
+    if (!strcasecmp(temp, linklist->member) &&
+       !strcasecmp(av[ACE_TYPE], linklist->type))
       return(0);
 
     linklist = linklist->next;