[dak/master] Switch from gid=800 to supplementaryGid=Debian

[Joerg Jaspert <joerg@debian.org>]

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian-security/dak.conf | 2 +-
 config/debian/dak.conf          | 2 +-
 daklib/dbconn.py                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 daklib/dbconn.py

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index e1869d3..ad47e33 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 e5b696a..2986c9e 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 e762ef7..c792ff5
--- 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 = {}
-- 
2.1.4