Changes to deal with new args being passed by moirad for MACHINE members

of lists.

diff --git a/incremental/winad/winad.c b/incremental/winad/winad.c
index d3b94e69c540d919bb8effe1b55a259b5a28e461..09ddeab81b8596c4e3ac309fdcb4590d63455c3e 100755 (executable)
--- a/incremental/winad/winad.c
+++ b/incremental/winad/winad.c
@@ -915,8 +915,8 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
         {
           if (afterc > LM_EXTRA_GROUP)
             {
-              strcpy(moira_list_id, before[LM_EXTRA_GID]);
-              strcpy(moira_user_id, before[LMN_LIST_ID]);
+              strcpy(moira_list_id, after[LMN_LIST_ID]);
+              strcpy(moira_user_id, after[LM_LIST_ID]);
             }
         }
       else if (!strcasecmp(ptr[LM_TYPE], "USER"))
@@ -949,8 +949,8 @@ void do_member(LDAP *ldap_handle, char *dn_path, char *ldap_hostname,
         {
           if (beforec > LM_EXTRA_GROUP)
             {
-              strcpy(moira_list_id, before[LM_EXTRA_GID]);
-              strcpy(moira_user_id, before[LMN_LIST_ID]);
+              strcpy(moira_list_id, before[LMN_LIST_ID]);
+              strcpy(moira_user_id, before[LM_LIST_ID]);
             }
         }
       else if (!strcasecmp(ptr[LM_TYPE], "USER"))