Permalink
Browse files

Merge "Support non-default role_id_attribute"

  • Loading branch information...
Jenkins authored and openstack-gerrit committed Dec 18, 2012
2 parents 4f4b4a7 + 5b3a74d commit 1a0d30bf0173f8e03abeac4bda2e807bd4f29412
Showing with 2 additions and 1 deletion.
  1. +2 −1 keystone/identity/backends/ldap/core.py
@@ -668,7 +668,8 @@ def _subrole_id_to_dn(self, role_id, tenant_id):
if tenant_id is None:
return self._id_to_dn(role_id)
else:
- return 'cn=%s,%s' % (ldap.dn.escape_dn_chars(role_id),
+ return '%s=%s,%s' % (self.id_attr,
+ ldap.dn.escape_dn_chars(role_id),
self.tenant_api._id_to_dn(tenant_id))
def get(self, id, filter=None):

0 comments on commit 1a0d30b

Please sign in to comment.