From 8bbba3a8f450675b0aadb7d444f54b0361b87f53 Mon Sep 17 00:00:00 2001
From: William Brown <william@blackhats.net.au>
Date: Apr 06 2020 02:28:35 +0000
Subject: Ticket 50933 - rfc2307compat.ldif - conflict with 60nis.ldif


Bug Description: In the process of adding rfc2307compat, it was noticed
by users of the optional 60nis.ldif schema that it also included some
incompatible definitions. This removes those in favoure of the rfc2307compat
versions.

Fix Description: Remove the conflicting definitions from 60nis.ldif in
favour of rfc2307compat.ldif. This may require intervention from users
of this optional schema to manage this update.

https://pagure.io/389-ds-base/issue/50933

Author: William Brown <william@blackhats.net.au>

Review by: ???

---

diff --git a/ldap/schema/10rfc2307compat.ldif b/ldap/schema/10rfc2307compat.ldif
index 8810231..92ab571 100644
--- a/ldap/schema/10rfc2307compat.ldif
+++ b/ldap/schema/10rfc2307compat.ldif
@@ -194,6 +194,7 @@ attributeTypes: (
   1.3.6.1.1.1.1.30 NAME 'nisDomain'
   DESC 'NIS domain'
   EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   )
 attributeTypes: (
diff --git a/ldap/schema/60nis.ldif b/ldap/schema/60nis.ldif
index 57ef402..70d5694 100644
--- a/ldap/schema/60nis.ldif
+++ b/ldap/schema/60nis.ldif
@@ -6,35 +6,41 @@ dn: cn=schema
 #
 ################################################################################
 #
-attributeTypes: (
-  1.3.6.1.1.1.1.28
-  NAME 'nisPublickey'
-  DESC 'nisPublickey'
-  EQUALITY caseIgnoreIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  )
+# == NOW FROM 10rfc2307compat.ldif
+#
+# attributeTypes: (
+#   1.3.6.1.1.1.1.28
+#   NAME 'nisPublickey'
+#   DESC 'nisPublickey'
+#   EQUALITY caseIgnoreIA5Match
+#   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+#   )
 #
 ################################################################################
 #
-attributeTypes: (
-  1.3.6.1.1.1.1.29
-  NAME 'nisSecretkey'
-  DESC 'nisSecretkey'
-  EQUALITY caseIgnoreIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  )
+# == NOW FROM 10rfc2307compat.ldif
+#
+# attributeTypes: (
+#   1.3.6.1.1.1.1.29
+#   NAME 'nisSecretkey'
+#   DESC 'nisSecretkey'
+#   EQUALITY caseIgnoreIA5Match
+#   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+#   )
 #
 ################################################################################
 #
-attributeTypes: (
-  1.3.6.1.4.1.1.1.1.12
-  NAME 'nisDomain'
-  DESC 'NIS domain'
-  SUP name
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  )
+# == NOW FROM 10rfc2307compat.ldif
+#
+# attributeTypes: (
+#   1.3.6.1.4.1.1.1.1.12
+#   NAME 'nisDomain'
+#   DESC 'NIS domain'
+#   SUP name
+#   EQUALITY caseIgnoreIA5Match
+#   SUBSTR caseIgnoreIA5SubstringsMatch
+#   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+#   )
 #
 ################################################################################
 #
@@ -89,14 +95,16 @@ objectClasses: (
 #
 ################################################################################
 #
-objectClasses: (
-  1.3.1.6.1.1.1.2.15
-  NAME 'nisDomainObject'
-  DESC 'nisDomainObject'
-  SUP top
-  AUXILIARY
-  MUST ( nisDomain )
-  )
+# == NOW FROM 10rfc2307compat.ldif
+#
+# objectClasses: (
+#   1.3.1.6.1.1.1.2.15
+#   NAME 'nisDomainObject'
+#   DESC 'nisDomainObject'
+#   SUP top
+#   AUXILIARY
+#   MUST ( nisDomain )
+#   )
 #
 ################################################################################
 #