Update ud-ldapshow and cleanup cruft around the usergroups changes

diff --git a/debian/changelog b/debian/changelog
index 7f201ee..3103054 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 userdir-ldap (0.3.87) UNRELEASED; urgency=medium
 
+  [ Peter Palfrader ]
   * remove dnsZoneEntry from restricted attributes to match config on db.d.o
   * ssh keys: Also accept ed25519 keys.  RSA keys must be at least 2k.
   * ud-useradd: now does usergroups by default.
   * ud-guest-upgrade: add.
 
+  [ Paul Wise ]
+  * Update ud-ldapshow and cleanup cruft around the usergroups changes
+
  -- Peter Palfrader <weasel@debian.org>  Wed, 28 Oct 2015 22:03:42 +0100
 
 userdir-ldap (0.3.86) unstable; urgency=medium

diff --git a/ud-generate b/ud-generate
index b438ece..7b9ca4c 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -161,9 +161,6 @@ def IsRetired(account):
 
    return False
 
-#def IsGidDebian(account):
-#   return account['gidNumber'] == 800
-
 # See if this user is in the group list
 def IsInGroup(account, allowed, current_host):
   # See if the primary group is in the list
@@ -1195,7 +1192,6 @@ def generate_all(global_dir, ldap_conn):
    accounts_disabled = GenDisabledAccounts(accounts, global_dir + "disabled-accounts")
 
    accounts = filter(lambda x: not IsRetired(x), accounts)
-   #accounts_DDs = filter(lambda x: IsGidDebian(x), accounts)
 
    CheckForward(accounts)
 

diff --git a/ud-ldapshow b/ud-ldapshow
index 70e1f70..43249a4 100755 (executable)
--- a/ud-ldapshow
+++ b/ud-ldapshow
@@ -76,7 +76,7 @@ if arguments[0] == "keymap":
            print "%s: %s" % (EmailAddress(x),I);
 
 if arguments[0] == "devcount":
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyFingerPrint=*)(gidNumber=800))",\
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyFingerPrint=*)(supplementaryGid=Debian))",\
            ["uid"]);
    Count = 0;
    for x in Attrs:
@@ -85,7 +85,7 @@ if arguments[0] == "devcount":
 
 if arguments[0] == "echelon":
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
-   "(&(|(activity-pgp=*)(activity-from=*))(&(keyFingerPrint=*)(gidNumber=800)))",\
+   "(&(|(activity-pgp=*)(activity-from=*))(&(keyFingerPrint=*)(supplementaryGid=Debian)))",\
            ["activity-pgp","activity-from"]);
    Count = 0;
    PGPCount = 0;
@@ -97,7 +97,7 @@ if arguments[0] == "echelon":
 
 if arguments[0] == "missing":
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
-   "(&(!(|(activity-pgp=*)(activity-from=*)))(&(keyFingerPrint=*)(gidNumber=800)))",\
+   "(&(!(|(activity-pgp=*)(activity-from=*)))(&(keyFingerPrint=*)(supplementaryGid=Debian)))",\
            ["uid","cn","sn","mn"]);
    Attrs.sort();
    for x in Attrs:

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index ce77700..7d2643b 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -41,9 +41,6 @@ haveprivatelist = True;
 ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
 ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
 
-# User properties
-defaultgid = 800;
-
 # For the output generator
 generatedir = "/var/cache/userdir-ldap/hosts/";
 passdir = "/etc/userdir-ldap/";

diff --git a/userdir_ldap.py b/userdir_ldap.py
index 29e5e7b..00f9d4b 100644 (file)
--- a/userdir_ldap.py
+++ b/userdir_ldap.py
@@ -40,7 +40,6 @@ AdminUser = ConfModule.adminuser;
 GenerateDir = ConfModule.generatedir;
 AllowedGroupsPreload = ConfModule.allowedgroupspreload;
 HomePrefix = ConfModule.homeprefix;
-DefaultGID = ConfModule.defaultgid;
 TemplatesDir = ConfModule.templatesdir;
 PassDir = ConfModule.passdir;
 Ech_ErrorLog = ConfModule.ech_errorlog;