|
 |
590d18 |
From 19f9ad712fc8d8652d66b8aac8befd9d83dad721 Mon Sep 17 00:00:00 2001
|
|
|
590d18 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
590d18 |
Date: Wed, 16 Sep 2015 08:24:22 +0200
|
|
|
590d18 |
Subject: [PATCH] config: allow user/host attributes with tagging options
|
|
|
590d18 |
|
|
|
590d18 |
https://fedorahosted.org/freeipa/ticket/5295
|
|
|
590d18 |
|
|
|
590d18 |
Reviewed-By: David Kupka <dkupka@redhat.com>
|
|
|
590d18 |
---
|
|
|
590d18 |
ipalib/plugins/config.py | 2 ++
|
|
|
590d18 |
1 file changed, 2 insertions(+)
|
|
|
590d18 |
|
|
|
590d18 |
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
|
|
|
590d18 |
index 6267313d5e9af2d97f45f987115de143d7aa7915..76368c0887f782153c3131c7833f78afe86dcf89 100644
|
|
|
590d18 |
--- a/ipalib/plugins/config.py
|
|
|
590d18 |
+++ b/ipalib/plugins/config.py
|
|
|
590d18 |
@@ -262,6 +262,7 @@ class config_mod(LDAPUpdate):
|
|
|
590d18 |
fields = entry_attrs[k].split(',')
|
|
|
590d18 |
for a in fields:
|
|
|
590d18 |
a = a.strip()
|
|
|
590d18 |
+ a, tomato, olive = a.partition(';')
|
|
|
590d18 |
if a not in allowed_attrs:
|
|
|
590d18 |
raise errors.ValidationError(
|
|
|
590d18 |
name=k, error=_('attribute "%s" not allowed') % a
|
|
|
590d18 |
@@ -281,6 +282,7 @@ class config_mod(LDAPUpdate):
|
|
|
590d18 |
if self.api.Object[obj].uuid_attribute:
|
|
|
590d18 |
checked_attrs = checked_attrs + [self.api.Object[obj].uuid_attribute]
|
|
|
590d18 |
for obj_attr in checked_attrs:
|
|
|
590d18 |
+ obj_attr, tomato, olive = obj_attr.partition(';')
|
|
|
590d18 |
if obj_attr in OPERATIONAL_ATTRIBUTES:
|
|
|
590d18 |
continue
|
|
|
590d18 |
if obj_attr in self.api.Object[obj].params and \
|
|
|
590d18 |
--
|
|
|
590d18 |
2.4.3
|
|
|
590d18 |
|