From: zacheiss <zacheiss>
Date: Tue, 3 Mar 2009 19:22:03 +0000 (+0000)
Subject: Check ace_type, not just name.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/0d2076dc6648fbc30c4ae4cdccc57b8dea5b3cf7

Check ace_type, not just name.
---

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index adac4777..296f840e 100755
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -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;