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/aci.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/aci.py')
-rw-r--r-- | ipalib/plugins/aci.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index 45900b357..4821089f1 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -126,7 +126,7 @@ from ipalib.aci import ACI from ipalib import output from ipalib import _, ngettext from ipalib.plugable import Registry -from ipalib.plugins.baseldap import gen_pkey_only_option +from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value from ipapython.ipa_log_manager import * from ipapython.dn import DN @@ -557,7 +557,7 @@ class aci_add(crud.Create): result = _aci_to_kw(ldap, newaci, kw.get('test', False)) return dict( result=result, - value=aciname, + value=pkey_to_value(aciname, kw), ) @@ -598,7 +598,7 @@ class aci_del(crud.Delete): return dict( result=True, - value=aciname, + value=pkey_to_value(aciname, options), ) @@ -666,7 +666,7 @@ class aci_mod(crud.Update): result = _aci_to_kw(ldap, newaci) return dict( result=result, - value=aciname, + value=pkey_to_value(aciname, kw), ) @@ -919,7 +919,7 @@ class aci_show(crud.Retrieve): result = _aci_to_kw(ldap, aci) return dict( result=result, - value=aciname, + value=pkey_to_value(aciname, kw), ) @@ -981,5 +981,5 @@ class aci_rename(crud.Update): result = _aci_to_kw(ldap, newaci) return dict( result=result, - value=kw['newname'], + value=pkey_to_value(kw['newname'], kw), ) |