pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone
Blob Blame History Raw
From 19f9ad712fc8d8652d66b8aac8befd9d83dad721 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Wed, 16 Sep 2015 08:24:22 +0200
Subject: [PATCH] config: allow user/host attributes with tagging options

https://fedorahosted.org/freeipa/ticket/5295

Reviewed-By: David Kupka <dkupka@redhat.com>
---
 ipalib/plugins/config.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index 6267313d5e9af2d97f45f987115de143d7aa7915..76368c0887f782153c3131c7833f78afe86dcf89 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 \
-- 
2.4.3