diff options
Diffstat (limited to 'ipa-python')
-rw-r--r-- | ipa-python/ipaclient.py | 12 | ||||
-rw-r--r-- | ipa-python/user.py | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py index 783c7ec85..28e560018 100644 --- a/ipa-python/ipaclient.py +++ b/ipa-python/ipaclient.py @@ -59,18 +59,18 @@ class IPAClient: # FIXME: This should be dynamic and can include just about anything # Let us add in some missing attributes - if user.get('homeDirectory') is None: - user['homeDirectory'] ='/home/%s' % user['uid'] + if user.get('homedirectory') is None: + user['homedirectory'] ='/home/%s' % user['uid'] if user.get('gecos') is None: user['gecos'] = user['uid'] # FIXME: This can be removed once the DS plugin is installed - user['uidNumber'] ='501' + user['uidnumber'] ='501' # FIXME: What is the default group for users? - user['gidNumber'] ='501' - user['krbPrincipalName'] = "%s@%s" % (user['uid'], realm) - user['cn'] = "%s %s" % (user['givenName'], user['sn']) + user['gidnumber'] ='501' + user['krbprincipalname'] = "%s@%s" % (user['uid'], realm) + user['cn'] = "%s %s" % (user['givenname'], user['sn']) if user.get('gn'): del user['gn'] diff --git a/ipa-python/user.py b/ipa-python/user.py index 3c925bfb3..ecbd2845c 100644 --- a/ipa-python/user.py +++ b/ipa-python/user.py @@ -58,9 +58,7 @@ class User: def getValue(self,name): """Get the first value for the attribute named name""" value = self.data.get(name,[None]) - if (len(value) < 1): - return value - if isinstance(value[0],list) or isinstance(value[0],tuple): + if isinstance(value,list) or isinstance(value,tuple): return value[0] else: return value |