← Back to branch summary

~ubuntu-branches/ubuntu/raring/keystone/raring-updates

« back to all changes in this revision

Viewing changes to keystone/identity/backends/ldap/core.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2013-10-17 13:52:59 UTC
  • mfrom: (1.1.37)
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20131017135259-dqiwbrzjs1q4mp6q
Tags: 1:2013.1.4-0ubuntu1
https://launchpad.net/bugs/1241202
* Resynchronize with stable/grizzly (9666fc0) (LP: #1241202):
  - [6792499] periodic-keystone-python27-stable-grizzly fails due to"No
    module named netaddr"   LP: 1212939
  - [775d7a7] Fix and test token revocation list API
  - [0876ea2] N+1 lookups in groups SQL LP: 1218675
  - [afbc75b] Disabling a tenant would not disable a user token LP: 1179955
  - [9666fc0] User operations with LDAP Identity and
    enabled_mask/user_enabled_default fail LP: 1210175

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystone/identity/backends/ldap/core.py
430
430
    def _ldap_res_to_model(self, res):
431
431
        obj = super(UserApi, self)._ldap_res_to_model(res)
432
432
        if self.enabled_mask != 0:
433
 
            obj['enabled_nomask'] = obj['enabled']
434
 
            obj['enabled'] = ((obj['enabled'] & self.enabled_mask) !=
 
433
            enabled = int(obj.get('enabled', self.enabled_default))
 
434
            obj['enabled_nomask'] = enabled
 
435
            obj['enabled'] = ((enabled & self.enabled_mask) !=
435
436
                              self.enabled_mask)
436
437
        return obj
437
438
 
438
439
    def mask_enabled_attribute(self, values):
439
440
        value = values['enabled']
440
 
        values.setdefault('enabled_nomask', self.enabled_default)
 
441
        values.setdefault('enabled_nomask', int(self.enabled_default))
441
442
        if value != ((values['enabled_nomask'] & self.enabled_mask) !=
442
443
                     self.enabled_mask):
443
444
            values['enabled_nomask'] ^= self.enabled_mask