Changes by tytso/probe (not checked in previously):

- Removed extraneous, unreachable code.
- Fixed logic where it was trying to edit memberships of lists that were
  inactive or not groups.  (Should have used OR not AND in the logic.)

diff --git a/incremental/afs.c b/incremental/afs.c
index ac881bd590245b2264a5dc99c3f03da2b78aef96..fcdcd78a2dcab120489269403937ace8cf13b25a 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -353,20 +353,16 @@ int afterc;
     if (afterc) {
        if (afterc < LM_EXTRA_END) {
            return;
-       } else if (afterc < LM_EXTRA_END) {
-           if (!atoi(after[LM_EXTRA_GROUP])) return;
        } else
-         if (!atoi(after[LM_EXTRA_ACTIVE]) && !atoi(after[LM_EXTRA_GROUP]))
+         if (!atoi(after[LM_EXTRA_ACTIVE]) || !atoi(after[LM_EXTRA_GROUP]))
            return;
        
        edit_group(1, after[LM_LIST], after[LM_TYPE], after[LM_MEMBER]);
     } else if (beforec) {
        if (beforec < LM_EXTRA_END) {
            return;
-       } else if (beforec < LM_EXTRA_END) {
-           if (!atoi(before[LM_EXTRA_GROUP])) return;
        } else
-         if (!atoi(before[LM_EXTRA_ACTIVE]) && !atoi(before[LM_EXTRA_GROUP]))
+         if (!atoi(before[LM_EXTRA_ACTIVE]) || !atoi(before[LM_EXTRA_GROUP]))
            return;
        edit_group(0, before[LM_LIST], before[LM_TYPE], before[LM_MEMBER]);
     }