From: Joerg Jaspert Date: Sat, 17 Oct 2015 12:12:28 +0000 (+0200) Subject: Switch from gid=800 to supplementaryGid=Debian X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c29b2d42946cb1cebc3e6e8ff9fcecb3fe7ef9d1;p=dak.git Switch from gid=800 to supplementaryGid=Debian Signed-off-by: Joerg Jaspert --- diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index e1869d3b..ad47e337 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -36,7 +36,7 @@ Process-Policy Import-Users-From-Passwd { - ValidGID "800"; + ValidGID "Debian"; // Comma separated list of users who are in Postgres but not the passwd file KnownPostgres "postgres,dak,www-data,udmsearch,repuser,debian-backup"; }; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index e5b696ac..2986c9ea 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -59,7 +59,7 @@ Show-Deferred Import-Users-From-Passwd { - ValidGID "800"; + ValidGID "Debian"; // Comma separated list of users who are in Postgres but not the passwd file KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup"; }; diff --git a/daklib/dbconn.py b/daklib/dbconn.py old mode 100644 new mode 100755 index e762ef72..c792ff5a --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -1031,7 +1031,7 @@ class Keyring(object): l.simple_bind_s("","") Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL, - "(&(keyfingerprint=*)(gidnumber=%s))" % (cnf["Import-Users-From-Passwd::ValidGID"]), + "(&(keyfingerprint=*)(supplementaryGid=%s))" % (cnf["Import-Users-From-Passwd::ValidGID"]), ["uid", "keyfingerprint", "cn", "mn", "sn"]) ldap_fin_uid_id = {}