Silently ignore if back-ldif is not present

[openldap] / servers / slapd / schema / core.schema

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 5f9d3af0e3eaa9d313db9e367e3f5c0b84e308cf..9a23e7b255ed6ba35d0f903402a17e92d9816312 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -127,9 +127,9 @@ attributetype ( 2.5.4.13 NAME 'description'
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
-# Obsoleted by enhancedSearchGuide
+# Deprecated by enhancedSearchGuide
 attributetype ( 2.5.4.14 NAME 'searchGuide'
-       DESC 'RFC2256: search guide, obsoleted by enhancedSearchGuide'
+       DESC 'RFC2256: search guide, deprecated by enhancedSearchGuide'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )
 
 attributetype ( 2.5.4.15 NAME 'businessCategory'
@@ -339,6 +339,9 @@ attributetype ( 2.5.4.54 NAME 'dmdName'
        DESC 'RFC2256: name of DMD'
        SUP name )
 
+attributetype ( 2.5.4.65 NAME 'pseudonym'
+       DESC 'X.520(4th): pseudonym for the object'
+       SUP name )
 
 # Standard object classes from RFC2256
 
@@ -366,7 +369,7 @@ objectclass ( 2.5.6.4 NAME 'organization'
        MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
                x121Address $ registeredAddress $ destinationIndicator $
                preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
-               telephoneNumber $ internationaliSDNNumber $
+               telephoneNumber $ internationaliSDNNumber $ 
                facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $
                postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) )
 
@@ -392,7 +395,7 @@ objectclass ( 2.5.6.7 NAME 'organizationalPerson'
        SUP person STRUCTURAL
        MAY ( title $ x121Address $ registeredAddress $ destinationIndicator $
                preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $
-               telephoneNumber $ internationaliSDNNumber $
+               telephoneNumber $ internationaliSDNNumber $ 
                facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $
                postalAddress $ physicalDeliveryOfficeName $ ou $ st $ l ) )
 
@@ -525,12 +528,12 @@ objectclass ( 1.3.6.1.4.1.250.3.15 NAME 'labeledURIObject'
 #
 # Derived from RFC 1274, but with new "short names"
 #
-attributetype ( 0.9.2342.19200300.100.1.1
-       NAME ( 'uid' 'userid' )
-       DESC 'RFC1274: user identifier'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
+#attributetype ( 0.9.2342.19200300.100.1.1
+#      NAME ( 'uid' 'userid' )
+#      DESC 'RFC1274: user identifier'
+#      EQUALITY caseIgnoreMatch
+#      SUBSTR caseIgnoreSubstringsMatch
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 
 attributetype ( 0.9.2342.19200300.100.1.3
        NAME ( 'mail' 'rfc822Mailbox' )
@@ -570,10 +573,10 @@ attributetype ( 0.9.2342.19200300.100.1.37
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-# RFC 2459
+# RFC 2459 -- deprecated in favor of 'mail' (in cosine.schema)
 attributetype ( 1.2.840.113549.1.9.1
        NAME ( 'email' 'emailAddress' 'pkcs9email' )
-       DESC 'RFC2459: legacy attribute for email addresses in DNs'
+       DESC 'RFC3280: legacy attribute for email addresses in DNs'
        EQUALITY caseIgnoreIA5Match
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )