From 905380cfbe31b421c558d7977cc4f1339b3bc89f Mon Sep 17 00:00:00 2001 From: ty Date: Thu, 21 Nov 2019 23:06:12 +0900 Subject: [PATCH] Adjusting label length. Restoring STRUCTURAL object class to mailAliasList. --- schemas/labeled.ldif | 4 ++-- schemas/labeled.schema | 8 ++++---- schemas/mailAliasList.ldif | 4 ++-- schemas/mailAliasList.schema | 11 ++++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/schemas/labeled.ldif b/schemas/labeled.ldif index 486586e..fccba1a 100644 --- a/schemas/labeled.ldif +++ b/schemas/labeled.ldif @@ -12,6 +12,6 @@ objectClass: olcSchemaConfig cn: labeled olcAttributeTypes: {0}( 1.3.6.1.4.1.54908.1.2.1 NAME 'label' DESC 'Free-form label' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYN - TAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + TAX 1.3.6.1.4.1.1466.115.121.1.26{32768} ) olcObjectClasses: {0}( 1.3.6.1.4.1.54908.1.2.2 NAME 'labeled' DESC 'Arbitrar - y labeling of record objects' SUP top STRUCTURAL MAY label ) + y labeling of record objects' SUP top AUXILIARY MAY label ) diff --git a/schemas/labeled.schema b/schemas/labeled.schema index 84e7172..cbe63ab 100644 --- a/schemas/labeled.schema +++ b/schemas/labeled.schema @@ -1,8 +1,8 @@ # Copyright Vivid Inc. Released under the terms of the Apache 2.0 license. # -# LDAP schema defining a label structural object and its corresponding attribute. +# LDAP schema defining a label auxiliary object class and its corresponding attribute. # Useful for adding ad-hoc, free-form labels to records without semantic limitation. -# An example LDAP record utilizing the `labeled' structural object class: +# An example LDAP record utilizing the `labeled' object class: # # |-- objectClass: labeled # ... @@ -18,9 +18,9 @@ attributetype ( 1.3.6.1.4.1.54908.1.2.1 NAME 'label' DESC 'Free-form label' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32768} ) objectclass ( 1.3.6.1.4.1.54908.1.2.2 NAME 'labeled' DESC 'Arbitrary labeling of record objects' - SUP top STRUCTURAL + SUP top AUXILIARY MAY label ) diff --git a/schemas/mailAliasList.ldif b/schemas/mailAliasList.ldif index f1e43f4..eaba619 100644 --- a/schemas/mailAliasList.ldif +++ b/schemas/mailAliasList.ldif @@ -17,5 +17,5 @@ olcAttributeTypes: {1}( 1.3.6.1.4.1.54908.1.1.2 NAME 'memberDn' DESC 'Alias redirects to members identified by DN' EQUALITY distinguishedNameMatch SYNT AX 1.3.6.1.4.1.1466.115.121.1.12 ) olcObjectClasses: {0}( 1.3.6.1.4.1.54908.1.1.3 NAME 'mailAliasList' DESC 'Em - ail address alias redirection list' SUP top STRUCTURAL MAY ( mailAlias $ me - mberDn ) ) + ail address alias redirection list' SUP top STRUCTURAL MUST cn MAY ( mailAl + ias $ memberDn $ description ) ) diff --git a/schemas/mailAliasList.schema b/schemas/mailAliasList.schema index 05873a3..c0fe34e 100644 --- a/schemas/mailAliasList.schema +++ b/schemas/mailAliasList.schema @@ -1,8 +1,8 @@ # Copyright Vivid Inc. Released under the terms of the Apache 2.0 license. # -# Defines a mail alias list structural object and its attendant attributes. -# Useful for receiving mail on virtual email addresses (mail aliases) and -# forwarding to actual email accounts. +# An LDAP schema defining a mail alias list structural object class and +# its attendant attributes. Useful for receiving mail on virtual email +# addresses (mail aliases) and forwarding to actual email accounts. # # This schema depends on core.schema. It has been battle-tested in # production on OpenLDAP for several years prior to being open-sourced. @@ -12,7 +12,7 @@ # # Example: # Here is an example LDAP object record utilizing the `mailAliasList' -# structural object. An email received at any of the `mailAlias' email +# object class. An email received at any of the `mailAlias' email # addresses would be redirected to every one of the email addresses # associated with the `memberDn' user accounts. The redirection is # performed by a mail daemon (MTA) configured to consult these @@ -79,4 +79,5 @@ attributetype ( 1.3.6.1.4.1.54908.1.1.2 NAME 'memberDn' objectclass ( 1.3.6.1.4.1.54908.1.1.3 NAME 'mailAliasList' DESC 'Email address alias redirection list' SUP top STRUCTURAL - MAY ( mailAlias $ memberDn ) ) + MUST cn + MAY ( mailAlias $ memberDn $ description ) )