From d339295826b6fab2bfa0064d81cca8ae20054a4d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 21 May 2011 16:42:41 +0200 Subject: [PATCH] Filter on shadowAccount --- debian/changelog | 3 ++- ud-generate | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c00bde2..022c979 100644 --- 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 Sat, 21 May 2011 16:03:00 +0200 + -- Peter Palfrader 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 --- 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", -- 2.20.1