Skip to content

Commit

Permalink
Fix LDAP Identity get user with user_enabled_mask
Browse files Browse the repository at this point in the history
Fetching users using the LDAP Identity backend would fail with

 KeyError: 'enabled'

from _ldap_res_to_model when user_enabled_mask is not 0.

Change-Id: I39a9606ba7210f0fea064abd6adad379218b432b
Closes-Bug: #1210175
  • Loading branch information
Brant Knudson committed Aug 16, 2013
1 parent 87ababb commit 781c65b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions keystone/identity/backends/ldap.py
Expand Up @@ -220,8 +220,9 @@ def __init__(self, conf):
def _ldap_res_to_model(self, res):
obj = super(UserApi, self)._ldap_res_to_model(res)
if self.enabled_mask != 0:
obj['enabled_nomask'] = obj['enabled']
obj['enabled'] = ((obj['enabled'] & self.enabled_mask) !=
enabled = int(obj.get('enabled', self.enabled_default))
obj['enabled_nomask'] = enabled
obj['enabled'] = ((enabled & self.enabled_mask) !=
self.enabled_mask)
return obj

Expand Down

0 comments on commit 781c65b

Please sign in to comment.