diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-03-27 14:04:00 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-04-18 14:59:20 +0200 |
| commit | 4314d02fbf9ef1cb9543ecf76a8d22e79d250214 (patch) | |
| tree | 8c6ac601e881712e8cf7c25fce420026a3762553 /ipalib/plugins/automount.py | |
| parent | c644b47492e22370bc71f57e5ac46b50f9b4e247 (diff) | |
| download | freeipa-4314d02fbf9ef1cb9543ecf76a8d22e79d250214.tar.gz freeipa-4314d02fbf9ef1cb9543ecf76a8d22e79d250214.tar.xz freeipa-4314d02fbf9ef1cb9543ecf76a8d22e79d250214.zip | |
Allow primary keys to use different type than unicode.
Also return list of primary keys instead of a single unicode CSV value from
LDAPDelete-based commands.
This introduces a new capability 'primary_key_types' for backward
compatibility with old clients.
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipalib/plugins/automount.py')
| -rw-r--r-- | ipalib/plugins/automount.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index b961b1c17..7b426b688 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -827,7 +827,7 @@ class automountkey_add(LDAPCreate): options[self.obj.primary_key.name] = self.obj.get_pk(key, info) options['add_operation'] = True result = super(automountkey_add, self).execute(*keys, **options) - result['value'] = options['automountkey'] + result['value'] = pkey_to_value(options['automountkey'], options) return result api.register(automountkey_add) @@ -923,7 +923,7 @@ class automountkey_del(LDAPDelete): options['automountkey'], options.get('automountinformation', None)) result = super(automountkey_del, self).execute(*keys, **options) - result['value'] = options['automountkey'] + result['value'] = pkey_to_value([options['automountkey']], options) return result api.register(automountkey_del) @@ -982,7 +982,7 @@ class automountkey_mod(LDAPUpdate): options['rename'] = new_rdn result = super(automountkey_mod, self).execute(*keys, **options) - result['value'] = options['automountkey'] + result['value'] = pkey_to_value(options['automountkey'], options) return result api.register(automountkey_mod) @@ -1026,7 +1026,7 @@ class automountkey_show(LDAPRetrieve): options.get('automountinformation', None)) result = super(automountkey_show, self).execute(*keys, **options) - result['value'] = options['automountkey'] + result['value'] = pkey_to_value(options['automountkey'], options) return result api.register(automountkey_show) |