diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2016-08-04 09:58:50 +0300 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-08-25 10:34:51 +0200 |
| commit | fab1f798ed6dfdb0b7de7c4fc4fe353f1d97177b (patch) | |
| tree | 4ab3f4bca9d78700a87565d95f357e7ebd22bafa | |
| parent | fa3b3193fabcaa37c2ba9865089fcfc06939c77f (diff) | |
support multiple uid values in schema compatibility tree
https://fedorahosted.org/freeipa/ticket/6138
Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
| -rw-r--r-- | freeipa.spec.in | 4 | ||||
| -rw-r--r-- | install/updates/10-schema_compat.update | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index a67dd44f1..e3ad5b668 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -12,9 +12,11 @@ %if 0%{?rhel} %global samba_version 4.0.5-1 %global selinux_policy_version 3.12.1-153 +%global slapi_nis_version 0.56.0-4 %else %global samba_version 2:4.0.5-1 %global selinux_policy_version 3.13.1-158.4 +%global slapi_nis_version 0.56.1 %endif %define krb5_base_version %(LC_ALL=C rpm -q --qf '%%{VERSION}' krb5-devel | grep -Eo '^[^.]+\.[^.]+') @@ -159,7 +161,7 @@ Requires(pre): systemd-units Requires(post): systemd-units Requires: selinux-policy >= %{selinux_policy_version} Requires(post): selinux-policy-base >= %{selinux_policy_version} -Requires: slapi-nis >= 0.56.0 +Requires: slapi-nis >= %{slapi_nis_version} Requires: pki-ca >= 10.3.3-3 Requires: pki-kra >= 10.3.3-3 Requires(preun): python systemd-units diff --git a/install/updates/10-schema_compat.update b/install/updates/10-schema_compat.update index e4c257d32..fbe870340 100644 --- a/install/updates/10-schema_compat.update +++ b/install/updates/10-schema_compat.update @@ -87,3 +87,7 @@ add:schema-compat-entry-attribute: %ifeq("ipauniqueid","%{ipauniqueid}","objectc add:schema-compat-entry-attribute: %ifeq("ipauniqueid","%{ipauniqueid}","ipaanchoruuid=:IPA:$DOMAIN:%{ipauniqueid}","") add:schema-compat-entry-attribute: ipaanchoruuid=%{ipaanchoruuid} add:schema-compat-entry-attribute: %ifeq("ipaanchoruuid","%{ipaanchoruuid}","objectclass=ipaOverrideTarget","") + +dn: cn=users,cn=Schema Compatibility,cn=plugins,cn=config +add:schema-compat-entry-attribute: uid=%{uid} +replace:schema-compat-entry-rdn: uid=%{uid}::uid=%first("%{uid}") |