|
 |
3280a9 |
From 826a1bb4ea88915ac492828d1cc4a901623f7866 Mon Sep 17 00:00:00 2001
|
|
|
3280a9 |
From: William Brown <william@blackhats.net.au>
|
|
|
3280a9 |
Date: Thu, 14 May 2020 14:31:47 +1000
|
|
|
3280a9 |
Subject: [PATCH 1/2] Ticket 50933 - Update 2307compat.ldif
|
|
|
3280a9 |
|
|
|
3280a9 |
Bug Description: This resolves a potential conflict between 60nis.ldif
|
|
|
3280a9 |
in freeipa and others with 2307compat, by removing the conflicting
|
|
|
3280a9 |
definitions from 2307bis that were included.
|
|
|
3280a9 |
|
|
|
3280a9 |
Fix Description: By not including these in 2307compat, this means that
|
|
|
3280a9 |
sites that rely on the values provided by 2307bis may ALSO need
|
|
|
3280a9 |
60nis.ldif to be present. However, these nis values seem like they are
|
|
|
3280a9 |
likely very rare in reality, and this also will avoid potential
|
|
|
3280a9 |
issues with freeipa. It also is the least disruptive as we don't need
|
|
|
3280a9 |
to change an already defined file, and we don't have values where the name
|
|
|
3280a9 |
to oid relationship changes.
|
|
|
3280a9 |
|
|
|
3280a9 |
Fixes: #50933
|
|
|
3280a9 |
https://pagure.io/389-ds-base/issue/50933
|
|
|
3280a9 |
|
|
|
3280a9 |
Author: William Brown <william@blackhats.net.au>
|
|
|
3280a9 |
|
|
|
3280a9 |
Review by: tbordaz (Thanks!)
|
|
|
3280a9 |
---
|
|
|
3280a9 |
ldap/schema/10rfc2307compat.ldif | 66 --------------------------------
|
|
|
3280a9 |
ldap/schema/60autofs.ldif | 39 ++++++++++++-------
|
|
|
3280a9 |
2 files changed, 26 insertions(+), 79 deletions(-)
|
|
|
3280a9 |
|
|
|
3280a9 |
diff --git a/ldap/schema/10rfc2307compat.ldif b/ldap/schema/10rfc2307compat.ldif
|
|
|
3280a9 |
index 8810231ac..78c588d08 100644
|
|
|
3280a9 |
--- a/ldap/schema/10rfc2307compat.ldif
|
|
|
3280a9 |
+++ b/ldap/schema/10rfc2307compat.ldif
|
|
|
3280a9 |
@@ -176,50 +176,6 @@ attributeTypes: (
|
|
|
3280a9 |
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
SINGLE-VALUE
|
|
|
3280a9 |
)
|
|
|
3280a9 |
-attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.28 NAME 'nisPublicKey'
|
|
|
3280a9 |
- DESC 'NIS public key'
|
|
|
3280a9 |
- EQUALITY octetStringMatch
|
|
|
3280a9 |
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
|
|
|
3280a9 |
- SINGLE-VALUE
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.29 NAME 'nisSecretKey'
|
|
|
3280a9 |
- DESC 'NIS secret key'
|
|
|
3280a9 |
- EQUALITY octetStringMatch
|
|
|
3280a9 |
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
|
|
|
3280a9 |
- SINGLE-VALUE
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.30 NAME 'nisDomain'
|
|
|
3280a9 |
- DESC 'NIS domain'
|
|
|
3280a9 |
- EQUALITY caseIgnoreIA5Match
|
|
|
3280a9 |
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.31 NAME 'automountMapName'
|
|
|
3280a9 |
- DESC 'automount Map Name'
|
|
|
3280a9 |
- EQUALITY caseExactIA5Match
|
|
|
3280a9 |
- SUBSTR caseExactIA5SubstringsMatch
|
|
|
3280a9 |
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
- SINGLE-VALUE
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.32 NAME 'automountKey'
|
|
|
3280a9 |
- DESC 'Automount Key value'
|
|
|
3280a9 |
- EQUALITY caseExactIA5Match
|
|
|
3280a9 |
- SUBSTR caseExactIA5SubstringsMatch
|
|
|
3280a9 |
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
- SINGLE-VALUE
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.33 NAME 'automountInformation'
|
|
|
3280a9 |
- DESC 'Automount information'
|
|
|
3280a9 |
- EQUALITY caseExactIA5Match
|
|
|
3280a9 |
- SUBSTR caseExactIA5SubstringsMatch
|
|
|
3280a9 |
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
- SINGLE-VALUE
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
# end of attribute types - beginning of objectclasses
|
|
|
3280a9 |
objectClasses: (
|
|
|
3280a9 |
1.3.6.1.1.1.2.0 NAME 'posixAccount' SUP top AUXILIARY
|
|
|
3280a9 |
@@ -324,28 +280,6 @@ objectClasses: (
|
|
|
3280a9 |
seeAlso $ serialNumber'
|
|
|
3280a9 |
MAY ( bootFile $ bootParameter $ cn $ description $ l $ o $ ou $ owner $ seeAlso $ serialNumber )
|
|
|
3280a9 |
)
|
|
|
3280a9 |
-objectClasses: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.2.14 NAME 'nisKeyObject' SUP top AUXILIARY
|
|
|
3280a9 |
- DESC 'An object with a public and secret key'
|
|
|
3280a9 |
- MUST ( cn $ nisPublicKey $ nisSecretKey )
|
|
|
3280a9 |
- MAY ( uidNumber $ description )
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-objectClasses: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.2.15 NAME 'nisDomainObject' SUP top AUXILIARY
|
|
|
3280a9 |
- DESC 'Associates a NIS domain with a naming context'
|
|
|
3280a9 |
- MUST nisDomain
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-objectClasses: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL
|
|
|
3280a9 |
- MUST ( automountMapName )
|
|
|
3280a9 |
- MAY description
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
-objectClasses: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL
|
|
|
3280a9 |
- DESC 'Automount information'
|
|
|
3280a9 |
- MUST ( automountKey $ automountInformation )
|
|
|
3280a9 |
- MAY description
|
|
|
3280a9 |
- )
|
|
|
3280a9 |
## namedObject is needed for groups without members
|
|
|
3280a9 |
objectClasses: (
|
|
|
3280a9 |
1.3.6.1.4.1.5322.13.1.1 NAME 'namedObject' SUP top STRUCTURAL
|
|
|
3280a9 |
diff --git a/ldap/schema/60autofs.ldif b/ldap/schema/60autofs.ldif
|
|
|
3280a9 |
index 084e9ec30..de3922aa2 100644
|
|
|
3280a9 |
--- a/ldap/schema/60autofs.ldif
|
|
|
3280a9 |
+++ b/ldap/schema/60autofs.ldif
|
|
|
3280a9 |
@@ -6,7 +6,23 @@ dn: cn=schema
|
|
|
3280a9 |
################################################################################
|
|
|
3280a9 |
#
|
|
|
3280a9 |
attributeTypes: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.1.33
|
|
|
3280a9 |
+ 1.3.6.1.1.1.1.31 NAME 'automountMapName'
|
|
|
3280a9 |
+ DESC 'automount Map Name'
|
|
|
3280a9 |
+ EQUALITY caseExactIA5Match
|
|
|
3280a9 |
+ SUBSTR caseExactIA5SubstringsMatch
|
|
|
3280a9 |
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
+ SINGLE-VALUE
|
|
|
3280a9 |
+ )
|
|
|
3280a9 |
+attributeTypes: (
|
|
|
3280a9 |
+ 1.3.6.1.1.1.1.32 NAME 'automountKey'
|
|
|
3280a9 |
+ DESC 'Automount Key value'
|
|
|
3280a9 |
+ EQUALITY caseExactIA5Match
|
|
|
3280a9 |
+ SUBSTR caseExactIA5SubstringsMatch
|
|
|
3280a9 |
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
|
|
3280a9 |
+ SINGLE-VALUE
|
|
|
3280a9 |
+ )
|
|
|
3280a9 |
+attributeTypes: (
|
|
|
3280a9 |
+ 1.3.6.1.1.1.1.33
|
|
|
3280a9 |
NAME 'automountInformation'
|
|
|
3280a9 |
DESC 'Information used by the autofs automounter'
|
|
|
3280a9 |
EQUALITY caseExactIA5Match
|
|
|
3280a9 |
@@ -18,25 +34,22 @@ attributeTypes: (
|
|
|
3280a9 |
################################################################################
|
|
|
3280a9 |
#
|
|
|
3280a9 |
objectClasses: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.2.17
|
|
|
3280a9 |
- NAME 'automount'
|
|
|
3280a9 |
- DESC 'An entry in an automounter map'
|
|
|
3280a9 |
+ 1.3.6.1.1.1.2.16
|
|
|
3280a9 |
+ NAME 'automountMap'
|
|
|
3280a9 |
+ DESC 'An group of related automount objects'
|
|
|
3280a9 |
SUP top
|
|
|
3280a9 |
STRUCTURAL
|
|
|
3280a9 |
- MUST ( cn $ automountInformation )
|
|
|
3280a9 |
- MAY ( description )
|
|
|
3280a9 |
+ MAY ( ou $ automountMapName $ description )
|
|
|
3280a9 |
X-ORIGIN 'draft-howard-rfc2307bis'
|
|
|
3280a9 |
)
|
|
|
3280a9 |
-#
|
|
|
3280a9 |
-################################################################################
|
|
|
3280a9 |
-#
|
|
|
3280a9 |
objectClasses: (
|
|
|
3280a9 |
- 1.3.6.1.1.1.2.16
|
|
|
3280a9 |
- NAME 'automountMap'
|
|
|
3280a9 |
- DESC 'An group of related automount objects'
|
|
|
3280a9 |
+ 1.3.6.1.1.1.2.17
|
|
|
3280a9 |
+ NAME 'automount'
|
|
|
3280a9 |
+ DESC 'An entry in an automounter map'
|
|
|
3280a9 |
SUP top
|
|
|
3280a9 |
STRUCTURAL
|
|
|
3280a9 |
- MUST ( ou )
|
|
|
3280a9 |
+ MUST ( automountInformation )
|
|
|
3280a9 |
+ MAY ( cn $ description $ automountKey )
|
|
|
3280a9 |
X-ORIGIN 'draft-howard-rfc2307bis'
|
|
|
3280a9 |
)
|
|
|
3280a9 |
#
|
|
|
3280a9 |
--
|
|
|
3280a9 |
2.26.2
|
|
|
3280a9 |
|