diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-12 23:22:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-12 23:22:07 +0000 |
| commit | 5b24ef5c01a3fd1d950e6f0edb19197e952661c5 (patch) | |
| tree | a814ffdaa11d791e029da40c962bb86055794a53 /keystone/identity | |
| parent | efb6b3fca0ba0ad768b3e803a324043095d326e2 (diff) | |
| parent | 2c29d4ca4bd841823aa57e0cea7e97d5c2854581 (diff) | |
| download | keystone-5b24ef5c01a3fd1d950e6f0edb19197e952661c5.tar.gz keystone-5b24ef5c01a3fd1d950e6f0edb19197e952661c5.tar.xz keystone-5b24ef5c01a3fd1d950e6f0edb19197e952661c5.zip | |
Merge "LDAP backend attribute fixes"
Diffstat (limited to 'keystone/identity')
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 5b32a679..03d3ab61 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -333,7 +333,7 @@ class UserApi(common_ldap.BaseLdap, ApiShimMixin): DEFAULT_OBJECTCLASS = 'inetOrgPerson' options_name = 'user' attribute_mapping = {'password': 'userPassword', - #'email': 'mail', + 'email': 'mail', 'name': 'sn'} # NOTE(ayoung): The RFC based schemas don't have a way to indicate @@ -341,7 +341,7 @@ class UserApi(common_ldap.BaseLdap, ApiShimMixin): # be part of any objectclass. # in the future, we need to provide a way for the end user to # indicate the field to use and what it indicates - attribute_ignore = ['tenant_id', 'enabled', 'tenants'] + attribute_ignore = ['tenantId', 'enabled', 'tenants'] model = models.User def __init__(self, conf): @@ -466,7 +466,8 @@ class TenantApi(common_ldap.BaseLdap, ApiShimMixin): DEFAULT_ID_ATTR = 'cn' DEFAULT_MEMBER_ATTRIBUTE = 'member' options_name = 'tenant' - attribute_mapping = {'description': 'desc', 'name': 'ou'} + attribute_mapping = {'name': 'ou', 'tenantId': 'cn'} + attribute_ignore = ['enabled'] model = models.Tenant def __init__(self, conf): |