Filter on shadowAccount

diff --git a/debian/changelog b/debian/changelog
index c00bde2..022c979 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
   * userdir_gpg.py: GetClearSig: add lax_multipart to deal
     with random multipart mails.
   * naming your variable like a module is unsmart.
+  * ud-generate: filter on shadowAccount.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 21 May 2011 16:03:00 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 21 May 2011 16:42:30 +0200
 
 userdir-ldap (0.3.79) unstable; urgency=low
 

diff --git a/ud-generate b/ud-generate
index 6116cd0..2721888 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -997,7 +997,7 @@ def GenKeyrings(OutDir):
 
 def get_accounts(ldap_conn):
    # Fetch all the users
-   passwd_attrs = ldap_conn.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "(&(uid=*)(!(uidNumber=0)))",\
+   passwd_attrs = ldap_conn.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "(&(uid=*)(!(uidNumber=0))(objectClass=shadowAccount))",\
                    ["uid", "uidNumber", "gidNumber", "supplementaryGid",\
                     "gecos", "loginShell", "userPassword", "shadowLastChange",\
                     "shadowMin", "shadowMax", "shadowWarning", "shadowInactive",