From aa3ed4a5e3414c95ffbebdcce32db10f5a890f71 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 17 May 2000 06:02:03 +0000 Subject: [PATCH] Minor cleanup --- servers/slapd/schema/core.schema | 31 +++++++++++++++--------------- servers/slapd/schema/cosine.schema | 3 ++- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema index d594a34642..68faca961e 100644 --- a/servers/slapd/schema/core.schema +++ b/servers/slapd/schema/core.schema @@ -224,31 +224,30 @@ attributetype ( 2.5.4.24 NAME 'x121Address' SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{15} ) attributetype ( 2.5.4.25 NAME 'internationaliSDNNumber' - EQUALITY - numericStringMatch + EQUALITY numericStringMatch SUBSTR numericStringSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} ) attributetype ( 2.5.4.26 NAME 'registeredAddress' SUP postalAddress - SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) attributetype ( 2.5.4.27 NAME 'destinationIndicator' EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} ) + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} ) attributetype ( 2.5.4.28 NAME 'preferredDeliveryMethod' - SYNTAX 1.3.6.1.4.1.1466.115.121.1.14 - SINGLE-VALUE ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.14 + SINGLE-VALUE ) attributetype ( 2.5.4.29 NAME 'presentationAddress' - EQUALITY presentationAddressMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 - SINGLE-VALUE ) + EQUALITY presentationAddressMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 + SINGLE-VALUE ) attributetype ( 2.5.4.30 NAME 'supportedApplicationContext' - EQUALITY objectIdentifierMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 ) + EQUALITY objectIdentifierMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 ) # Placed here because others derive from it. @@ -525,12 +524,14 @@ attributetype ( 1.3.6.1.4.1.1466.101.119.4 NAME 'dynamicSubtrees' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 NO-USER-MODIFICATION USAGE dSAOperation ) -# Derived from RFC1274 +# Derived from RFC1274, but with new "short names" attributetype ( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) DESC 'RFC1274 user identifier' - SUP name ) + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'rfc822Mailbox' 'mail' ) +attributetype ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822Mailbox' ) DESC 'rfc822 mail box' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch diff --git a/servers/slapd/schema/cosine.schema b/servers/slapd/schema/cosine.schema index 03d1ab9e7f..0d7779a752 100644 --- a/servers/slapd/schema/cosine.schema +++ b/servers/slapd/schema/cosine.schema @@ -615,7 +615,8 @@ attributetype ( 0.9.2342.19200300.100.1.42 # caseIgnoreStringSyntax # ::= {pilotAttributeType 43} # -attributetype ( 0.9.2342.19200300.100.1.43 NAME 'friendlyCountryName' +attributetype ( 0.9.2342.19200300.100.1.43 + NAME ( 'friendlyCountryName' 'co' ) EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) -- 2.39.5