aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-04-20 10:43:45 -0700
committerBrian Dolbec <dolsen@gentoo.org>2015-05-30 16:25:13 -0700
commitc87ffff6633693275ca5bbb67f81102bd2838123 (patch)
tree43aed717b913c48d9786282a693a56472559427d /gkeys-ldap/gkeyldap/config.py
parentgkeys/gkey.py: Fix typo in @license (diff)
downloadgentoo-keys-c87ffff6633693275ca5bbb67f81102bd2838123.tar.gz
gentoo-keys-c87ffff6633693275ca5bbb67f81102bd2838123.tar.bz2
gentoo-keys-c87ffff6633693275ca5bbb67f81102bd2838123.zip
gkeys-ldap: Remove keyid/longkeyid from ldap search info
Diffstat (limited to 'gkeys-ldap/gkeyldap/config.py')
-rw-r--r--gkeys-ldap/gkeyldap/config.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/gkeys-ldap/gkeyldap/config.py b/gkeys-ldap/gkeyldap/config.py
index f7fb837..fe56e78 100644
--- a/gkeys-ldap/gkeyldap/config.py
+++ b/gkeys-ldap/gkeyldap/config.py
@@ -5,15 +5,13 @@
default_server = ['ldap://ldap%d.gentoo.org' % i for i in xrange(1,5)]
# add uid to the results so you don't have to
# separate it out of the results tuple[0] value
-default_fields = ['uid', 'cn', 'mail', 'gentooStatus', 'gpgkey', 'gpgfingerprint']
+default_fields = ['uid', 'cn', 'mail', 'gentooStatus', 'gpgfingerprint']
default_criteria = 'ou=devs,dc=gentoo,dc=org'
# establish a ldap fields to GKEY._fields map
gkey2ldap = {
'nick': 'uid',
'name': 'cn',
- 'keyid': 'gpgkey',
- 'longkeyid': 'gpgkey',
# map the uid to keydir, since we want
# dev keydir to be separate from each other
'keydir': 'uid',
@@ -33,7 +31,6 @@ gkey2SEARCH = {
'nick': UID,
'name': CN,
'status': STATUS,
- 'keyid': GPGKEY,
'mail': MAIL,
'fingerprint': GPGFINGERPRINT,
}