X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/39fa010cedef55b259b9ba2a2cb7c596fdbcb12f..f2a412cadaaa21aaffe966c63e3f1b752d3eb304:/gen/acl.pc

diff --git a/gen/acl.pc b/gen/acl.pc
index e2f9c5b1..35942a61 100644
--- a/gen/acl.pc
+++ b/gen/acl.pc
@@ -115,6 +115,8 @@ int main(int argc, char **argv)
 		dump_passwd_file(out, lid);
 	      else if (!strcasecmp(kind, "group"))
 		dump_group_file(out, lid);
+	      else if (!strcasecmp(kind, "userlist"))
+		dump_user_list(out, "LIST", lid);
 	    }
 
 	  tarfile_end(tf);
@@ -149,7 +151,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 +301,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 +378,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);