Reviewed: https://review.openstack.org/43524 Committed: http://github.com/openstack/keystone/commit/801a81506e688bca800bd4164b4210fdcc5fee05 Submitter: Jenkins Branch: stable/grizzly
commit 801a81506e688bca800bd4164b4210fdcc5fee05 Author: Brant Knudson <email address hidden> Date: Thu Aug 8 15:36:20 2013 -0500
Fixes for Active Directory
The LDAP Identity backend was not properly using the user_enabled_default option as a string. This caused operations to fail with
TypeError: unsupported operand type(s) for &: 'str' and 'int'
Also, fetching users using the LDAP Identity backend would fail with
KeyError: 'enabled'
from _ldap_res_to_model when user_enabled_mask is not 0.
Closes-Bug: #1210175 (cherry picked from commit 68f38a65c60485c34474e490d649b328421e10f5) (cherry picked from commit 116897786dbb8473154ec85a01b019af8106a1f4) (cherry picked from commit 54178b735dea4dfee4578caa95cb3ae704afef07) (cherry picked from commit 87ababb38506a1a51b9e38fc343dd3b46c828a80) (cherry picked from commit 781c65b72b78bd1e2b1d93db029d6b0c6fbc2050)
Change-Id: Ic01aa505d867c1de30e2a1ed7c79ff1478e213ef
Reviewed: https:/ /review. openstack. org/43524 github. com/openstack/ keystone/ commit/ 801a81506e688bc a800bd4164b4210 fdcc5fee05
Committed: http://
Submitter: Jenkins
Branch: stable/grizzly
commit 801a81506e688bc a800bd4164b4210 fdcc5fee05
Author: Brant Knudson <email address hidden>
Date: Thu Aug 8 15:36:20 2013 -0500
Fixes for Active Directory
The LDAP Identity backend was not properly using the enabled_ default option as a string. This caused
user_
operations to fail with
TypeError: unsupported operand type(s) for &: 'str' and 'int'
Also, fetching users using the LDAP Identity backend would fail with
KeyError: 'enabled'
from _ldap_res_to_model when user_enabled_mask is not 0.
Closes-Bug: #1210175 34474e490d649b3 28421e10f5) 3154ec85a01b019 af8106a1f4) ee4578caa95cb3a e704afef07) 51b9e38fc343dd3 b46c828a80) e2b1d93db029d6b 0c6fbc2050)
(cherry picked from commit 68f38a65c60485c
(cherry picked from commit 116897786dbb847
(cherry picked from commit 54178b735dea4df
(cherry picked from commit 87ababb38506a1a
(cherry picked from commit 781c65b72b78bd1
Change-Id: Ic01aa505d867c1 de30e2a1ed7c79f f1478e213ef