|
 |
403b09 |
From 485e70f9ca0e7352b17839b2375092f7a886bc81 Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
403b09 |
Date: Thu, 4 Aug 2016 09:58:50 +0300
|
|
|
403b09 |
Subject: [PATCH] support multiple uid values in schema compatibility tree
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6138
|
|
|
403b09 |
|
|
|
403b09 |
Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
freeipa.spec.in | 4 +++-
|
|
|
403b09 |
install/updates/10-schema_compat.update | 4 ++++
|
|
|
403b09 |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
|
|
403b09 |
index 08343d9f2049680185ddd32428b040824d882d66..7456a9ea77ec289312eb11c05709018b3d6d0c90 100644
|
|
|
403b09 |
--- a/freeipa.spec.in
|
|
|
403b09 |
+++ b/freeipa.spec.in
|
|
|
403b09 |
@@ -12,9 +12,11 @@
|
|
|
403b09 |
%if 0%{?rhel}
|
|
|
403b09 |
%global samba_version 4.0.5-1
|
|
|
403b09 |
%global selinux_policy_version 3.12.1-153
|
|
|
403b09 |
+%global slapi_nis_version 0.56.0-4
|
|
|
403b09 |
%else
|
|
|
403b09 |
%global samba_version 2:4.0.5-1
|
|
|
403b09 |
%global selinux_policy_version 3.13.1-158.4
|
|
|
403b09 |
+%global slapi_nis_version 0.56.1
|
|
|
403b09 |
%endif
|
|
|
403b09 |
|
|
|
403b09 |
%define krb5_base_version %(LC_ALL=C rpm -q --qf '%%{VERSION}' krb5-devel | grep -Eo '^[^.]+\.[^.]+')
|
|
|
403b09 |
@@ -156,7 +158,7 @@ Requires(pre): systemd-units
|
|
|
403b09 |
Requires(post): systemd-units
|
|
|
403b09 |
Requires: selinux-policy >= %{selinux_policy_version}
|
|
|
403b09 |
Requires(post): selinux-policy-base >= %{selinux_policy_version}
|
|
|
403b09 |
-Requires: slapi-nis >= 0.56.0
|
|
|
403b09 |
+Requires: slapi-nis >= %{slapi_nis_version}
|
|
|
403b09 |
Requires: pki-ca >= 10.3.4
|
|
|
403b09 |
Requires: pki-kra >= 10.3.4
|
|
|
403b09 |
Requires(preun): python systemd-units
|
|
|
403b09 |
diff --git a/install/updates/10-schema_compat.update b/install/updates/10-schema_compat.update
|
|
|
403b09 |
index e4c257d323644a93757e01027d3b8ed62c2ca98c..fbe8703407aacd75baf160630c20835a1b4ddc65 100644
|
|
|
403b09 |
--- a/install/updates/10-schema_compat.update
|
|
|
403b09 |
+++ b/install/updates/10-schema_compat.update
|
|
|
403b09 |
@@ -87,3 +87,7 @@ add:schema-compat-entry-attribute: %ifeq("ipauniqueid","%{ipauniqueid}","objectc
|
|
|
403b09 |
add:schema-compat-entry-attribute: %ifeq("ipauniqueid","%{ipauniqueid}","ipaanchoruuid=:IPA:$DOMAIN:%{ipauniqueid}","")
|
|
|
403b09 |
add:schema-compat-entry-attribute: ipaanchoruuid=%{ipaanchoruuid}
|
|
|
403b09 |
add:schema-compat-entry-attribute: %ifeq("ipaanchoruuid","%{ipaanchoruuid}","objectclass=ipaOverrideTarget","")
|
|
|
403b09 |
+
|
|
|
403b09 |
+dn: cn=users,cn=Schema Compatibility,cn=plugins,cn=config
|
|
|
403b09 |
+add:schema-compat-entry-attribute: uid=%{uid}
|
|
|
403b09 |
+replace:schema-compat-entry-rdn: uid=%{uid}::uid=%first("%{uid}")
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|