summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keystone/identity/backends/ldap.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index 58b70a5c..5898da1f 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.py
@@ -220,8 +220,9 @@ class UserApi(common_ldap.EnabledEmuMixIn, common_ldap.BaseLdap):
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