x/gantt
Code Issues Proposed changes

Removing redundant check

Browse Source
This commit is contained in:
Ryan Lane
2010-12-07 23:46:18 +00:00
parent 38dc83a468
commit 01fe606fa4
1 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
nova/auth/ldapdriver.py
View File

@@ -135,34 +135,29 @@ class LdapDriver(object):
if self.__ldap_user_exists(name): if self.__ldap_user_exists(name):
# Retrieve user by name # Retrieve user by name
user = self.__get_ldap_user(name) user = self.__get_ldap_user(name)
if user.has_key('accessKey') and user.has_key('secretKey') \ # Entry could be malformed, test for missing attrs.
and user.has_key('isAdmin'): # Malformed entries are useless, replace attributes found.
raise exception.Duplicate("LDAP user %s already exists" \ attr = []
% name) if user.has_key('secretKey'):
attr.append((self.ldap.MOD_REPLACE, 'secretKey', \
[secret_key]))
else: else:
# Entry could be malformed, test for missing attrs. attr.append((self.ldap.MOD_ADD, 'secretKey', \
# Malformed entries are useless, replace attributes found. [secret_key]))
attr = [] if user.has_key('accessKey'):
if user.has_key('secretKey'): attr.append((self.ldap.MOD_REPLACE, 'accessKey', \
attr.append((self.ldap.MOD_REPLACE, 'secretKey', \ [access_key]))
[secret_key])) else:
else: attr.append((self.ldap.MOD_ADD, 'accessKey', \
attr.append((self.ldap.MOD_ADD, 'secretKey', \ [access_key]))
[secret_key])) if user.has_key('isAdmin'):
if user.has_key('accessKey'): attr.append((self.ldap.MOD_REPLACE, 'isAdmin', \
attr.append((self.ldap.MOD_REPLACE, 'accessKey', \ [str(is_admin).upper()]))
[access_key])) else:
else: attr.append((self.ldap.MOD_ADD, 'isAdmin', \
attr.append((self.ldap.MOD_ADD, 'accessKey', \ [str(is_admin).upper()]))
[access_key])) self.conn.modify_s(self.__uid_to_dn(name), attr)
if user.has_key('isAdmin'): return self.get_user(name)
attr.append((self.ldap.MOD_REPLACE, 'isAdmin', \
[str(is_admin).upper()]))
else:
attr.append((self.ldap.MOD_ADD, 'isAdmin', \
[str(is_admin).upper()]))
self.conn.modify_s(self.__uid_to_dn(name), attr)
return self.get_user(name)
else: else:
attr = [ attr = [
('objectclass', ['person', ('objectclass', ['person',