Don't put deactivated users in generated acl files.

diff --git a/gen/acl.pc b/gen/acl.pc
index e2f9c5b1cb7e3a4ced06f35371595b3b34180d5a..b439e991c0bb12d5c66a852ba7db23e7fe72c877 100644 (file)
--- a/gen/acl.pc
+++ b/gen/acl.pc
@@ -149,7 +149,7 @@ void dump_access_file(FILE *out, int lid)
        {
          name = strtok_r(m->name, "@", &lasts);
          EXEC SQL SELECT count(login) INTO :i FROM users 
-           WHERE login = :name;
+           WHERE login = :name and status != 3;
          if (i == 1)
            {
              if (*(m->tag))
@@ -299,7 +299,7 @@ void dump_passwd_file(FILE *out, int lid)
          name = strtok_r(m->name, "@", &lasts);
            
          EXEC SQL SELECT count(login) INTO :i FROM users WHERE 
-           login = :name;
+           login = :name and status != 3;
          if (i == 1)
            {
              EXEC SQL SELECT unix_uid, shell, fullname, nickname,
@@ -376,7 +376,7 @@ void dump_group_file(FILE *out, int id)
                {
                  n = strtok_r(m->name, "@", &lasts);
                  EXEC SQL SELECT count(login) INTO :i FROM users
-                   WHERE login = :n;
+                   WHERE login = :n and status != 3;
                  if (i == 1)
                    {
                      fprintf(out, "%s%s", maybecomma, n);

diff --git a/gen/genacl.pc b/gen/genacl.pc
index 61d728cf360e30cce9a4c0811fcdf02908600eb3..ad5bb038ec0a95462b00d84221559d531796de8c 100644 (file)
--- a/gen/genacl.pc
+++ b/gen/genacl.pc
@@ -129,7 +129,7 @@ struct save_queue *get_acl(char *type, int id,
 static void save_imember(struct save_queue *sq, char *type, int id, char *tag)
 {
   EXEC SQL BEGIN DECLARE SECTION;
-  int lid = id, mid, mid2, tagid;
+  int lid = id, mid, mid2, tagid, status;
   char mtype[IMEMBERS_MEMBER_TYPE_SIZE];
   EXEC SQL END DECLARE SECTION;
   char *mtag;
@@ -137,7 +137,9 @@ static void save_imember(struct save_queue *sq, char *type, int id, char *tag)
   switch (*type)
     {
     case 'U':
-      sq_save_data(sq, imember('U', user_lookup(id), tag));
+      EXEC SQL SELECT status INTO :status FROM users WHERE users_id = :id;
+      if (status != 3)
+       sq_save_data(sq, imember('U', user_lookup(id), tag));
       break;
 
     case 'K':