From 26437c46b057c87d01a1f43b038257a7d6bc5825 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 14 Aug 1999 00:04:27 +0000 Subject: [PATCH] Added labeledURI (standard track schema) from RFC2047 Minor schema file cleanup --- servers/slapd/schema/core.schema | 18 ++++++++++++++++-- servers/slapd/schema/misc.schema | 16 +++++++++------- servers/slapd/schema/pilot.schema | 1 - 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema index 3ccfd708c6..3738b7478f 100644 --- a/servers/slapd/schema/core.schema +++ b/servers/slapd/schema/core.schema @@ -1,6 +1,9 @@ - # OpenLDAP Core schema -# Includes "standard" schema items from RFC2251-RFC2256 +# +# Includes "standard" schema items from: +# RFC2251-RFC2256 (LDAPv3) +# RFC2079 (URI) +# # Standard X.501(93) Operational Attribute Types from RFC2252 @@ -439,6 +442,17 @@ objectclass ( 2.5.6.20 NAME 'dmd' SUP top STRUCTURAL MUST ( dmdName ) objectclass ( 1.3.6.1.4.1.1466.101.120.111 NAME 'extensibleObject' SUP top AUXILIARY ) +# +# Standard Track URI label schema from RFC2079 +# +attribute ( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI' + DESC 'Uniform Resource Identifier with optional label' + EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) + +objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject' + DESC 'object that contains the URI attribute type' + MAY ( labeledURI ) SUP top AUXILIARY ) + # # From draft-ietf-ldapext-nameref-00.txt # used to represent referrals in the directory diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema index 9eef8a2a90..75cdbcc65c 100644 --- a/servers/slapd/schema/misc.schema +++ b/servers/slapd/schema/misc.schema @@ -1,15 +1,13 @@ - # Assorted definitions from several sources -# This file uses definitions from slapd.std.schema and -# slapd.pilot.schema - -# This comes from RFC2247 - +# +# RFC2247 +# objectclass ( 1.3.6.1.4.1.1466.344 NAME 'dcObject' SUP top AUXILIARY MUST dc ) +# # This comes from RFC2377 - +# objectclass ( 1.3.6.1.1.3.1 NAME 'uidObject' SUP top AUXILIARY MUST uid ) # Origin of this has not been identified. We had it and Netscape has it @@ -19,3 +17,7 @@ attribute ( 1.3.6.1.4.1.250.1.60 NAME ( 'timeToLive' 'ttl' ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) objectclass ( 1.3.6.1.4.1.250.3.18 NAME 'cacheObject' SUP top MAY ttl ) + +# +# RFC 2079 +# diff --git a/servers/slapd/schema/pilot.schema b/servers/slapd/schema/pilot.schema index bc6e5a34b2..d807f78419 100644 --- a/servers/slapd/schema/pilot.schema +++ b/servers/slapd/schema/pilot.schema @@ -1,4 +1,3 @@ - # These come from RFC1274 and are in ASN.1 syntax. They have been # translated with some imagination. Only attributes and classes we # already had are here. In general, the matching rules in the -- 2.39.5