summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-09-16 08:24:22 +0200
committerJan Cholasta <jcholast@redhat.com>2015-09-16 15:01:34 +0200
commit60dd90cf77097cd305f9cad4b03d28f2977dd38b (patch)
tree25f78bd8294a5420163fd634061c3d8c1fd532e8
parent1b70521e6b9a16fc0d06b798b8cc1f8b943c476a (diff)
downloadfreeipa-60dd90cf77097cd305f9cad4b03d28f2977dd38b.tar.gz
freeipa-60dd90cf77097cd305f9cad4b03d28f2977dd38b.tar.xz
freeipa-60dd90cf77097cd305f9cad4b03d28f2977dd38b.zip
config: allow user/host attributes with tagging options
https://fedorahosted.org/freeipa/ticket/5295 Reviewed-By: David Kupka <dkupka@redhat.com>
-rw-r--r--ipalib/plugins/config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index c8153c311..f9e99a6e7 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -262,6 +262,7 @@ class config_mod(LDAPUpdate):
fields = entry_attrs[k].split(',')
for a in fields:
a = a.strip()
+ a, tomato, olive = a.partition(';')
if a not in allowed_attrs:
raise errors.ValidationError(
name=k, error=_('attribute "%s" not allowed') % a
@@ -281,6 +282,7 @@ class config_mod(LDAPUpdate):
if self.api.Object[obj].uuid_attribute:
checked_attrs = checked_attrs + [self.api.Object[obj].uuid_attribute]
for obj_attr in checked_attrs:
+ obj_attr, tomato, olive = obj_attr.partition(';')
if obj_attr in OPERATIONAL_ATTRIBUTES:
continue
if obj_attr in self.api.Object[obj].params and \