]> git.sur5r.net Git - openldap/commitdiff
Move old schema files to Attic.
authorKurt Zeilenga <kurt@openldap.org>
Mon, 5 Jun 2000 07:17:51 +0000 (07:17 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Mon, 5 Jun 2000 07:17:51 +0000 (07:17 +0000)
SLAPD_SCHEMA_COMPAT *should* be able to use schema files

servers/slapd/Makefile.in
servers/slapd/schema/internet_mail.at.conf [deleted file]
servers/slapd/schema/internet_mail.oc.conf [deleted file]
servers/slapd/schema/nis.at.conf [deleted file]
servers/slapd/schema/nis.oc.conf [deleted file]
servers/slapd/schema/others_nis.at.conf [deleted file]
servers/slapd/schema/others_nis.oc.conf [deleted file]
tests/README
tests/data/slapd.at.conf [deleted file]
tests/data/slapd.oc.conf [deleted file]

index c74463ef394010be13d22b67ca0f77d0d1276833..fb974d5c7e290c9a338899124a69fb6185d20803 100644 (file)
@@ -240,16 +240,12 @@ install-slapd: FORCE
        fi
 
 
-CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
-
 all-cffiles: slapd
-       @for i in $(CFFILES); do \
-               tmpcf=$$i.tmp; \
-               $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
-                       -e 's;%LOCALSTATEDIR%;$(localstatedir);' \
-                       -e 's;%MODULEDIR%;$(moduledir);' \
-                       $(srcdir)/$$i > $$tmpcf ; \
-       done
+       cf=slapd.conf tmpcf=$$cf.tmp; \
+       $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
+               -e 's;%LOCALSTATEDIR%;$(localstatedir);' \
+               -e 's;%MODULEDIR%;$(moduledir);' \
+               $(srcdir)/$$cf > $$tmpcf ; \
        touch all-cffiles
 
 install-schema: FORCE
@@ -269,22 +265,15 @@ install-schema: FORCE
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
        @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-ldbm
-       @for i in $(CFFILES); do \
-               tmpcf=$$i.tmp ; \
-               if test $$i = slapd.conf ; then \
-                       mode=600 ; \
-               else \
-                       mode=644 ; \
-               fi ; \
-               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
-                       echo "installing $$i in $(sysconfdir)"; \
-                       echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i"; \
-                       $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i; \
-               else \
-                       echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/$$i" ; \
-               fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i.default ; \
-       done
+       cf=slapd.conf tmpcf=$$cf.tmp mode=600 ; \
+       if test ! -f $(DESTDIR)$(sysconfdir)/$$cf; then \
+               echo "installing $$cf in $(sysconfdir)"; \
+               echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i"; \
+               $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$cf; \
+       else \
+               echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/$$cf" ; \
+       fi; \
+       $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$cf.default
 
 install-tools: FORCE
        @-$(MKDIR) $(DESTDIR)$(sbindir)
diff --git a/servers/slapd/schema/internet_mail.at.conf b/servers/slapd/schema/internet_mail.at.conf
deleted file mode 100644 (file)
index aaaae2b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-# $OpenLDAP$
-#
-# By:          Juan C. Gomez / gomez@engr.sgi.com
-# Date:                May/1999
-# Source:      draft-lachman-ldap-mail-routing-03.txt
-# ---------------------------------------------------------
-#
-# Written by Juan C. Gomez and placed into the public domain.
-# This file is not subject to any license of SGI.
-#
-# ---------------------------------------------------------
-#
-# Attribute specifications for using LDAP as a back-end
-# for mail routing. As specified in:
-#
-# *********************************************************
-# draft-lachman-ldap-mail-routing-03.txt
-# By   :       H. Lachman @ Netscape Communications Corp.
-# Date :       October 1998
-#      "LDAP Schema Definitions for Intranet Mail Routing -
-#       The mailRecipient Object Class"
-# *********************************************************
-#
-
-
-
-
-#
-# This is here because, perhaps in the future, we will have
-# richer schema support in OpenLDAP.
-#
-# ----------------------FORMAL DESCRIPTION-----------------
-#
-# OID          2.16.840.1.113730.3.1.13
-# NAME         'mailAlternateAddress'
-# DESC         'alternate RFC 822 email address of this recipient'
-# EQUALITY     caseIgnoreIA5Match
-# SYNTAX       '1.3.6.1.4.1.1466.115.121.1.26{256}'
-#
-#
-# OID          2.16.840.1.113730.3.1.18
-# NAME         'mailHost'
-# DESC         'fully qualified hostname of the SMTP MTA that
-#               handles messages for this recipient'
-# EQUALITY     caseIgnoreIA5Match
-# SYNTAX       '1.3.6.1.4.1.1466.115.121.1.26{256}' SINGLE-VALUE
-#
-#
-# OID          2.16.840.1.113730.3.1.47
-# NAME         'mailRoutingAddress'
-# DESC         'RFC 822 address to use when routing messages to
-#                the SMTP MTA of this recipient'
-# EQUALITY     caseIgnoreIA5Match
-# SYNTAX       '1.3.6.1.4.1.1466.115.121.1.26{256}' SINGLE-VALUE
-#
-# ----------------------END FORMAL DESCRIPTION-----------------
-
-
-
-
-attribute      mailAlternateAddress    cis
-attribute      mailHost                cis
-attribute      mailRoutingAddress      cis
diff --git a/servers/slapd/schema/internet_mail.oc.conf b/servers/slapd/schema/internet_mail.oc.conf
deleted file mode 100644 (file)
index a707778..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# $OpenLDAP$
-#
-# By:          Juan C. Gomez / gomez@engr.sgi.com
-# Date:                May/1999
-# Source:      draft-lachman-ldap-mail-routing-03.txt
-# ---------------------------------------------------------
-#
-# Written by Juan C. Gomez and placed into the public domain.
-# This file is not subject to any license of SGI.
-#
-# ---------------------------------------------------------
-#
-# Object class specifications for using LDAP as a back-end 
-# for mail routing. As specified in:
-#
-# *********************************************************
-# draft-lachman-ldap-mail-routing-03.txt
-# By   :       H. Lachman @ Netscape Communications Corp.
-# Date :       October 1998
-#      "LDAP Schema Definitions for Intranet Mail Routing -
-#       The mailRecipient Object Class"
-# *********************************************************
-#
-
-
-
-
-#
-# This is here because, perhaps in the future, we will have
-# richer schema support in OpenLDAP.
-#
-# ----------------------FORMAL DESCRIPTION-----------------
-#
-#
-# OID  2.16.840.1.113730.3.2.3
-# NAME  'mailRecipient' SUP top AUXILIARY
-# MAY  ( cn $ mail $ mailAlternateAddress $ mailHost $
-#      mailRoutingAddress )
-#
-# ----------------------END FORMAL DESCRIPTION-------------
-
-objectclass    mailRecipient
-       requires
-               objectClass
-       allows
-               cn,
-               mail,
-               mailAlternateAddress,
-               mailHost,
-               mailRoutingAddress
diff --git a/servers/slapd/schema/nis.at.conf b/servers/slapd/schema/nis.at.conf
deleted file mode 100644 (file)
index 1331c3c..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-# $OpenLDAP$
-#
-# By:          Juan C. Gomez / gomez@engr.sgi.com
-# Date:                May/1999
-# Source:      RFC-2307
-# ---------------------------------------------------------
-#
-# Written by Juan C. Gomez and placed into the public domain.
-# This file is not subject to any license of SGI.
-#
-# ---------------------------------------------------------
-#
-# Attribute definitions for using LDAP as a back-end for 
-# Network Information Services (NIS) with OpenLDAP server. 
-#
-# I am adding the whole description here because, perhaps,
-# we will move towards better schema support in the future
-# and will have all the keywords to express the attribute
-# description more accurately.
-#
-# nisSchema OID = 1.3.6.1.1.1
-#                iso.org.dod.internet.directory.nisSchema
-#
-# NOTES:
-#
-# 1.- Two attributes have as a super-type the name attribute
-#     described in RFC-2256. The 'name' attribute has the 
-#     following description: (see X.520 for further details)
-#
-#      OID             2.5.4.41
-#      NAME            name
-#      SUBSTRINGS      caseIgnoreSubstringsMatch
-#      SYNTAX          DirectoryString{32768}
-# 
-#     DirectoryString Syntax (OID=1.3.6.1.4.1.1466.115.121.1.15)
-#     is described in RFC-2252, basically a UTF-8 (Unicode
-#     Superset) encoded string.
-#
-# 2.- The syntax for nisNetgroupTriple is 'nisNetgroupTripleSyntax',
-#     defined as:
-#
-#      OID             nisSchema.0.0
-#      NAME            'nisNetgroupTripleSyntax'
-#      DESC            'NIS netgroup triple'
-#      
-#     Where values in this syntax can be described as:
-#
-#      nisNetgroupTripleSyntax ::= SEQUENCE {
-#              hostname        [0] IA5String OPTIONAL,
-#              username        [1] IA5String OPTIONAL,
-#              domainname      [2] IA5String OPTIONAL
-#      }
-#     
-#     (These values are encoded as strings in LDAP servers)
-#
-# 3.- The syntax for bootParameter is 'bootParameterSyntax',
-#     defined as :
-#
-#      OID             nisSchema.0.1
-#      NAME            'bootParameterSyntax'
-#      DESC            'Boot Parameter'
-# 
-#     Where values in this syntax can be described as:
-#
-#      bootParameterSyntax ::= SEQUENCE {
-#              key      IA5String,
-#              server   IA5String,
-#              path     IA5String
-#      }
-#
-#     (These values are encoded as strings in LDAP servers)
-#
-
-
-# ----------------------FORMAL DESCRIPTION--------------------
-# OID          nisSchema.1.0
-# NAME         uidNumber
-# DESC         'An integer uniquely identifying a user in an
-#              administrative domain'
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'       SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.1
-# NAME         gidNumber
-# DESC         'An integer uniquely identifying a group in an
-#              administrative domain'
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'       SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.2
-# NAME         gecos
-# DESC         'The GECOS field; the common name'
-# EQUALITY     caseIgnoreIA5Match
-# SUBSTRINGS   caseIgnoreIA5SubstringsMatch
-# SYNTAX       'IA5String'      SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.3
-# NAME         homeDirectory
-# DESC         'The absolute path to the home directory'
-# EQUALITY     caseExactIA5Match
-# SYNTAX       'IA5String'      SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.4
-# NAME         loginShell
-# DESC         'The path to the login shell'
-# EQUALITY     caseExactIA5Match
-# SYNTAX       'IA5String'      SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.5
-# NAME         shadowLastChange
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.6
-# NAME         shadowMin
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.7
-# NAME         shadowMax
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.8
-# NAME         shadowWarning
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.9
-# NAME         shadowInactive
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.10
-# NAME         shadowExpire
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.11
-# NAME         shadowFlag
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INTEGER'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.12
-# NAME         memberUid
-# DESC         ''
-# EQUALITY     caseExactIA5Match
-# SUBSTRINGS   caseExactIA5SubstringsMatch
-# SYNTAX       'IA5String'
-#
-#
-# OID          nisSchema.1.13
-# NAME         memberNisNetgroup
-# DESC         ''
-# EQUALITY     caseExactIA5Match
-# SUBSTRINGS   caseExactIA5SubstringsMatch
-# SYNTAX       'IA5String'
-#
-#
-# OID          nisSchema.1.14
-# NAME         memberNisNetgroup
-# DESC         'Netgroup triple'
-# SYNTAX       'nisNetgroupTripleSyntax'
-#
-#
-# OID          nisSchema.1.15
-# NAME         ipServicePort
-# DESC         ''
-# EQUALITY     integerMatch
-# SYNTAX       'INSTEGER'      SINGLE-VALUE    
-#
-#
-# OID          nisSchema.1.16
-# NAME         ipServiceProtocol
-# SUP          name
-#
-#
-# OID          nisSchema.1.17
-# NAME         ipServiceNUmber
-# EQUALITY     integerMatch
-# SYNTAX       'INSTEGER'      SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.18
-# NAME         oncRpcNumber
-# EQUALITY     integerMatch
-# SYNTAX       'INSTEGER'      SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.19
-# NAME         ipHostNumber
-# DESC         'IP address as a dotted decimal, eg. 192.168.1.1
-#              omitting leading zeros'
-# EQUALITY     caseIgnoreIA5Match
-# SYNTAX       'IA5String{128}'
-#
-#
-# OID          nisSchema.1.20
-# NAME         ipNetworkNumber
-# DESC         'IP network as a dotted decimal, eg. 192.168,
-#              omitting leading zeros'
-# EQUALITY     caseIgnoreIA5Match
-# SYNTAX       'IA5String{128}'        SINGLE-VALUE
-#
-#
-# OID          nisSchema.1.21
-# NAME         ipNetmaskNumber
-# DESC         'IP netmask as a dotted decimal, eg. 255.255.255.0,
-#              omitting leading zeros'
-# EQUALITY     caseIgnoreIA5Match      
-# SYNTAX       'IA5String{128}'        SINGLE-VALUE    
-#
-#
-# OID          nisSchema.1.22
-# NAME         macAddress
-# DESC         'MAC address in maximal, colon separated hex notation, 
-#              eg. 00:00:92:90:ee:e2'
-# EQUALITY     caseIgnoreIA5Match
-# SYNTAX       'IA5String{128}'
-#
-#
-# OID          nisSchema.1.23
-# NAME         bootParameter
-# DESC         'rpc.bootparamd parameter'
-# SYNTAX       'bootParameterSyntax'
-#
-#
-# OID          nisSchema.1.24
-# NAME         bootFile
-# DESC         'Boot image name'
-# EQUALITY     caseExactIA5Match
-# SYNTAX       'IA5String'
-#
-#
-# OID          nisSchema.1.26
-# NAME         nisMapName
-# DESC         ''
-# SUP          name
-#
-#
-# OID          nisSchema.1.27
-# NAME         nisMapEntry
-# DESC         ''
-# EQUALITY     caseExactIA5Match
-# SUBSTRINGS   caseExactIA5SubstringMatch
-# SYNTAX       'IA5String{1024}'       SINGLE-VALUE
-#
-# ----------------------END FORMAL DESCRIPTION-------------
-
-
-
-attribute      uidNumber               ces
-attribute      gidNumber               ces
-attribute      gecos                   cis
-attribute      homeDirectory           ces
-attribute      loginShell              ces
-attribute      shadowLastChange        ces
-attribute      shadowMin               ces
-attribute      shadowMax               ces
-attribute      shadowWarning           ces
-attribute      shadowInactive          ces
-attribute      shadowExpire            ces
-attribute      shadowFlag              ces
-attribute      memberUid               ces
-attribute      memberNisNetgroup       ces
-attribute      nisNetgroupTriple       ces
-attribute      ipServicePort           ces
-attribute      ipServiceProtocol       cis
-attribute      ipProtocolNumber        ces
-attribute      oncRpcNumber            ces
-attribute      ipHostNumber            cis
-attribute      ipNetworkNumber         cis
-attribute      ipNetmaskNumber         cis
-attribute      macAddress              cis
-attribute      bootParameter           ces
-attribute      bootFile                ces
-attribute      nisMapName              cis
-attribute      nisMapEntry             ces
diff --git a/servers/slapd/schema/nis.oc.conf b/servers/slapd/schema/nis.oc.conf
deleted file mode 100644 (file)
index fe8a110..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-# $OpenLDAP$
-#
-# By:          Juan C. Gomez / gomez@engr.sgi.com
-# Date:                May/1999
-# Source:      RFC-2307
-# ---------------------------------------------------------
-#
-# Written by Juan C. Gomez and placed into the public domain.
-# This file is not subject to any license of SGI.
-#
-# ---------------------------------------------------------
-#
-# Object Classes for using LDAP as a backend for Network
-# Information Services (NIS).
-# (As Proposed in RFC-2307)
-# 
-
-
-
-
-# ----------------------FORMAL DESCRIPTION--------------------
-# OID  nisSchema.2.0 
-# NAME 'posixAccount' SUP top AUXILIARY
-# DESC 'Abstraction of an account with POSIX attributes'
-# MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory )
-# MAY  ( userPassword $ loginShell $ gecos $ description ) )
-#
-#
-# OID  nisSchema.2.1
-# NAME 'shadowAccount' SUP top AUXILIARY
-# DESC 'Additional attributes for shadow passwords'
-# MUST uid
-# MAY ( userPassword $ shadowLastChange $ shadowMin
-#       shadowMax $ shadowWarning $ shadowInactive $
-#       shadowExpire $ shadowFlag $ description )
-#
-#
-# OID  nisSchema.2.2 NAME 'posixGroup' SUP top STRUCTURAL
-# DESC  'Abstraction of a group of accounts'
-# MUST ( cn $ gidNumber )
-# MAY ( userPassword $ memberUid $ description ) )
-#
-#
-# OID          nisSchema.2.3 NAME 'ipService' SUP top STRUCTURAL
-# DESC         'Abstraction an Internet Protocol service.
-#               Maps an IP port and protocol (such as tcp or udp)
-#               to one or more names; the distinguished value of
-#               the cn attribute denotes the service's canonical
-#               name'
-# MUST         ( cn $ ipServicePort $ ipServiceProtocol )
-# MAY          ( description )
-#
-#
-# OID          nisSchema.2.4 NAME 'ipProtocol' SUP top STRUCTURAL
-# DESC         'Abstraction of an IP protocol. Maps a protocol number
-#               to one or more names. The distinguished value of the cn
-#               attribute denotes the protocol's canonical name'
-# MUST         ( cn $ ipProtocolNumber $ description )
-# MAY          description 
-#
-#
-# OID  nisSchema.2.5 NAME 'oncRpc' SUP top STRUCTURAL
-# DESC 'Abstraction of an Open Network Computing (ONC)
-#       [RFC1057] Remote Procedure Call (RPC) binding.
-#       This class maps an ONC RPC number to a name.
-#       The distinguished value of the cn attribute denotes
-#        the RPC service's canonical name'
-# MUST ( cn $ oncRpcNumber $ description )
-# MAY  description
-#
-#
-# OID  nisSchema.2.6 NAME 'ipHost' SUP top AUXILIARY
-# DESC 'Abstraction of a host, an IP device. The distinguished
-#        value of the cn attribute denotes the host's canonical
-#        name. Device SHOULD be used as a structural class'
-# MUST ( cn $ ipHostNumber )
-# MAY  ( l $ description $ manager ) )
-#
-#
-# OID  nisSchema.2.7 NAME 'ipNetwork' SUP top STRUCTURAL
-# DESC 'Abstraction of a network. The distinguished value of
-#       the cn attribute denotes the network's canonical name'
-# MUST ( cn $ ipNetworkNumber )
-# MAY  ( ipNetmaskNumber $ l $ description $ manager ) )
-#
-#
-# OID  nisSchema.2.8 NAME 'nisNetgroup' SUP top STRUCTURAL
-# DESC 'Abstraction of a netgroup. May refer to other netgroups'
-# MUST cn
-# MAY  ( nisNetgroupTriple $ memberNisNetgroup $ description )
-#
-#
-# OID  nisSchema.2.09 NAME 'nisMap' SUP top STRUCTURAL
-# DESC 'A generic abstraction of a NIS map'
-# MUST nisMapName
-# MAY  description
-#
-#
-# OID  nisSchema.2.10 NAME 'nisObject' SUP top STRUCTURAL
-# DESC 'An entry in a NIS map'
-# MUST ( cn $ nisMapEntry $ nisMapName )
-# MAY  description
-#
-#
-# OID  nisSchema.2.11 NAME 'ieee802Device' SUP top AUXILIARY
-# DESC 'A device with a MAC address; device SHOULD be
-#      used as a structural class'
-# MAY macAddress
-#
-#
-# OID  nisSchema.2.12 NAME 'bootableDevice' SUP top AUXILIARY
-# DESC 'A device with boot parameters; device SHOULD be
-#      used as a structural class'
-# MAY  ( bootFile $ bootParameter )
-#
-# ----------------------END FORMAL DESCRIPTION-------------
-
-
-
-
-objectclass    posixAccount
-       requires
-               objectClass,
-               cn,
-               uid,
-               uidNumber,
-               gidNumber,
-               homeDirectory
-       allows
-               userPassword,
-               loginShell,
-               gecos,
-               description
-       
-objectclass    shadowAccount
-       requires
-               objectClass,
-               uid
-       allows
-               userPassword,
-               shadowLastChange,
-               shadowMin,
-               shadowMax,
-               shadowWarning,
-               shadowInactive,
-               shadowExpire,
-               shadowFlag,
-               description
-
-objectclass    posixGroup
-       requires
-               objectClass,
-               cn,
-               gidNumber
-       allows
-               userPassword,
-               memberUid,
-               description
-
-objectclass    ipService
-       requires
-               objectClass,
-               cn,
-               ipServicePort,
-               ipServiceProtocol
-       allows
-               description
-
-objectclass    ipProtocol
-       requires
-               objectClass,
-               cn,
-               ipProtocolNumber,
-               description
-       allows
-               description
-
-objectclass    oncRpc
-       requires
-               objectClass,
-               cn,
-               oncRpcNumber,
-               description
-       allows
-               description
-
-objectclass    ipHost
-       requires
-               objectClass,
-               cn,
-               ipHostNumber
-       allows
-               l,
-               description,
-               manager
-
-objectclass    ipNetwork
-       requires
-               objectClass,
-               cn,
-               ipNetworkNumber
-       allows
-               ipNetmaskNumber,
-               l,
-               description,
-               manager
-
-objectclass    nisNetgroup
-       requires
-               objectClass,
-               cn
-       allows
-               nisNetgroupTriple,
-               memberNisNetgroup,
-               description
-
-objectclass    nisMap
-       requires
-               objectClass,
-               nisMapName
-       allows
-               description
-
-objectclass    nisObject
-       requires
-               objectClass,
-               cn,
-               nisMapEntry,
-               nisMapName
-       allows
-               description
-
-objectclass    ieee802Device
-       requires
-               objectClass
-       allows
-               macAddress
-
-objectclass    bootableDevice
-       requires
-               objectClass
-       allows
-               bootFile,
-               bootParameter
diff --git a/servers/slapd/schema/others_nis.at.conf b/servers/slapd/schema/others_nis.at.conf
deleted file mode 100644 (file)
index 1c6d91e..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-# $OpenLDAP$
-#
-# By:          Juan C. Gomez / gomez@engr.sgi.com
-# Date:                May/1999
-# Source:      RFC-2307
-# ------------------------------------------------------------
-# Attribute definitions for using LDAP as a back-end for Network
-# Information Services (NIS) with an OpenLDAP server. 
-# This file holds the definitions of those attributes used in 
-# RFC-2307, which are defined in other RFCs or X500 standards. 
-# You may not need to include this file if you already have 
-# these definitions in your default configuration files (i.e. 
-# slapd.at.conf).
-#
-
-
-
-#
-# ----------------------FORMAL DESCRIPTION--------------------
-#
-# RFC-2256     ( 2.5.4.23 NAME 'facsimileTelephoneNumber'
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
-# RFC-1274     facsimileTelephoneNumber ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX FacsimileTelephoneNumber
-#              ::= {attributeType 23}
-#
-#
-# RFC-2256     ( 2.5.4.14 NAME 'searchGuide'
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.25 )
-# RFC-1274     searchGuide ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX Guide
-#              ::= {attributeType 14}
-#
-#
-# RFC-2256     ( 2.5.4.15 NAME 'businessCategory' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-# RFC-1274     businessCategory ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-business-category))
-#              ::= {attributeType 15}
-#
-#  
-# RFC-2256     ( 2.5.4.24 NAME 'x121Address' EQUALITY numericStringMatch
-#              SUBSTR numericStringSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{15} )
-# RFC-1274     x121Address ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX NumericString
-#              (SIZE (1..ub-x121-address))
-#              ::= {attributeType 24}
-#
-# 
-# RFC-2256     ( 2.5.4.26 NAME 'registeredAddress' SUP postalAddress
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-# RFC-1274     registeredAddress ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX PostalAddress
-#              ::= {attributeType 26}
-#
-#
-# RFC-2256     ( 2.5.4.27 NAME 'destinationIndicator' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{128} )
-# RFC-1274     destinationIndicator ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX PrintableString
-#              (SIZE (1..ub-destination-indicator))
-#              MATCHES FOR EQUALITY SUBSTRINGS
-#              ::= {attributeType 27}
-#
-# 
-# RFC-2256     ( 2.5.4.28 NAME 'preferredDeliveryMethod'
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.14
-#              SINGLE-VALUE )
-# RFC-1274     preferredDeliveryMethod ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX deliveryMethod
-#              ::= {attributeType 28}
-#
-# 
-# RFC-2256     ( 2.5.4.21 NAME 'telexNumber'
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.52 )
-# RFC-1274     telexNumber ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX TelexNumber
-#              (SIZE (1..ub-telex))
-#              ::= {attributeType 21}
-#
-#
-# RFC-2256     ( 2.5.4.22 NAME 'teletexTerminalIdentifier'
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.51 )
-# RFC-1274     teletexTerminalIdentifier ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX TeletexTerminalIdentifier
-#              (SIZE (1..ub-teletex-terminal-id))
-#              ::= {attributeType 22}
-#
-#
-# RFC-2256     ( 2.5.4.20 NAME 'telephoneNumber' EQUALITY telephoneNumberMatch
-#              SUBSTR telephoneNumberSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.50{32} )
-# RFC-1274      telephoneNumber ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX telephoneNumberSyntax
-#              (SIZE (1..ub-telephone-number))
-#
-# 
-# RFC-2256     ( 2.5.4.25 NAME 'internationaliSDNNumber' 
-#              EQUALITY numericStringMatch
-#              SUBSTR numericStringSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} )
-# RFC-1274      internationaliSDNNumber ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX NumericString
-#              (SIZE (1..ub-isdn-address))
-#              ::= {attributeType 2
-#
-#
-# RFC-2256     ( 2.5.4.9 NAME 'street' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-# RFC-1274     streetAddress ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-street-address))
-#              ::= {attributeType 9}
-#
-# 
-#  RFC-2256    ( 2.5.4.18 NAME 'postOfficeBox' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
-#  RFC-1274     postOfficeBox ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-post-office-box))
-#              ::= {attributeType 18}
-# 
-#
-#  RFC-2256    ( 2.5.4.17 NAME 'postalCode' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{40} )
-#  RFC-1274    postalCode ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-postal-code))
-#              ::= {attributeType 17}
-#
-#
-#  RFC-2256    ( 2.5.4.16 NAME 'postalAddress' EQUALITY caseIgnoreListMatch
-#              SUBSTR caseIgnoreListSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-#  RFC-1274     postalAddress ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX PostalAddress
-#              MATCHES FOR EQUALITY
-#              ::= {attributeType 16}
-#
-#
-#  RFC-2256    ( 2.5.4.19 NAME 'physicalDeliveryOfficeName'
-#              EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-#  RFC-1274     physicalDeliveryOfficeName ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-physical-office-name))
-#              ::= {attributeType 19}
-#
-#
-#  RFC-2256    ( 2.5.4.8 NAME 'st' SUP name )
-#  RFC-1274    stateOrProvinceName ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-state-name))
-#              ::= {attributeType 8}
-#
-#
-#  RFC-2256    ( 2.5.4.0 NAME 'objectClass' EQUALITY objectIdentifierMatch
-#                SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
-#  RFC-1274    objectClass ObjectClass
-#              ::= {attributeType 0}
-#
-#
-#  RFC-2256 ( 2.5.4.3 NAME 'cn' SUP name )
-#  RFC-1274    commonName ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX caseIgnoreStringSyntax
-#              (SIZE (1..ub-common-name))
-#              ::= {attributeType 3}
-#
-#
-# RFC-1274     userid ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX
-#              caseIgnoreStringSyntax
-#              (SIZE (1 .. ub-user-identifier))
-#              ::= {pilotAttributeType 1}
-#
-#
-#  RFC-2256    ( 2.5.4.35 NAME 'userPassword' EQUALITY octetStringMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )
-#  RFC-1274    userPassword ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX Userpassword
-#              ::= {attributeType 35}
-#
-#
-#  RFC-2256    ( 2.5.4.13 NAME 'description' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-#
-#
-#  RFC-2256    ( 2.5.4.7 NAME 'l' SUP name )
-#
-#
-#  RFC-1274    manager ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX
-#              distinguishedNameSyntax
-#              ::= {pilotAttributeType 10}
-#
-#
-#  RFC-2256    ( 2.5.4.5 NAME 'serialNumber' EQUALITY caseIgnoreMatch
-#              SUBSTR caseIgnoreSubstringsMatch
-#              SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{64} )
-#  RFC-1274    serialNumber ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX printableStringSyntax
-#              (SIZE (1..ub-serial-number))
-#              ::= {attributeType 5}
-#
-#
-#  RFC-2256    ( 2.5.4.10 NAME 'o' SUP name )
-#
-#
-#  RFC-2256    ( 2.5.4.11 NAME 'ou' SUP name )
-#
-#
-#  RFC-2256    ( 2.5.4.6 NAME 'c' SUP name SINGLE-VALUE )
-#  RFC-1274    countryName ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX PrintableString
-#              (SIZE (1..ub-country-code))
-#              SINGLE VALUE
-#              ::= {attributeType 6}
-#
-#
-#  RFC-2256    ( 2.5.4.34 NAME 'seeAlso' SUP distinguishedName )
-#  RFC-1274    seeAlso ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX distinguishedNameSyntax
-#              ::= {attributeType 34}
-#
-#
-#  RFC-1274     host ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX
-#              caseIgnoreStringSyntax
-#              (SIZE (1 .. ub-host))
-#              ::= {pilotAttributeType 9}
-#
-#
-#  RFC-2256    ( 2.5.4.32 NAME 'owner' SUP distinguishedName )
-#  RFC-1274    owner ATTRIBUTE
-#              WITH ATTRIBUTE-SYNTAX distinguishedNameSyntax
-#              ::= {attributeType 32}
-#
-# ----------------------END FORMAL DESCRIPTION-------------
-#
-
-
-
-
-attribute      facsimileTelephoneNumber        fax     tel
-attribute      searchGuide                             cis
-attribute      businessCategory                        cis
-attribute      x121Address                             cis
-attribute      registeredAddress                       cis
-attribute      destinationIndicator                    cis
-attribute      preferredDeliveryMethod                 cis
-attribute      telexNumber                             cis
-attribute      teletexTerminalIdentifier               cis
-attribute      telephoneNumber                         tel
-attribute      internationaliSDNNumber                 ces
-attribute      street                                  cis
-attribute      postOfficeBox                           cis
-attribute      postalCode                              cis
-attribute      postalAddress                           cis
-attribute      physicalDeliveryOfficeName              cis
-attribute      st                                      cis
-attribute      objectClass                             cis
-attribute      cn      commonName                      cis
-attribute      uid     userid                          cis
-attribute      userPassword                            ces
-attribute      description                             cis
-attribute      l       localityName                    cis
-attribute      manager                                 dn
-attribute      serialNumber                            cis
-attribute      o       organizationName                cis
-attribute      ou      organizationalUnitName          cis
-attribute      c       countryName                     cis
-attribute      seeAlso                                 dn
-attribute      host                                    cis
-attribute      owner                                   dn
diff --git a/servers/slapd/schema/others_nis.oc.conf b/servers/slapd/schema/others_nis.oc.conf
deleted file mode 100644 (file)
index ad3833e..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-# $OpenLDAP$
-#
-# By:          Juan C. Gomez
-# Date:                05/04/1999
-# Source:      RFC-2307
-# ------------------------------------------------------------
-# Object class definitions for using LDAP as a back-end for Network
-# Information Services (NIS) with an OpenLDAP server. 
-# This file holds the definitions of those attributes used in 
-# RFC-2307, which are defined in other RFCs or X500 standards. 
-# You may not need to include this file if you already have these 
-# definitions in your default configuration files (i.e. 
-# slapd.oc.conf).
-#
-
-
-
-
-#
-# ----------------------FORMAL DESCRIPTION--------------------
-#
-# RFC-2256     ( 2.5.6.0 NAME 'top' ABSTRACT MUST objectClass )
-# RFC-1274     top OBJECT-CLASS
-#              MUST CONTAIN {
-#              objectClass}
-#              ::= {objectClass 0}
-#
-#
-# RFC-2256     ( 2.5.6.4 NAME 'organization' SUP top STRUCTURAL MUST o
-#              MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $
-#              x121Address $ registeredAddress $ destinationIndicator $
-#              preferredDeliveryMethod $ telexNumber $ 
-#              teletexTerminalIdentifier $ telephoneNumber $
-#              internationaliSDNNumber $ facsimileTelephoneNumber $
-#              street $ postOfficeBox $ postalCode $ postalAddress $
-#              physicalDeliveryOfficeName $ st $ l $ description ) )
-# RFC-1274     organization OBJECT-CLASS
-#              SUBCLASS OF top
-#              MUST CONTAIN {
-#              organizationName}
-#              MAY CONTAIN {
-#              organizationalAttributeSet}
-#              ::= {objectClass 4}
-#  
-#
-# RFC-1274     account OBJECT-CLASS
-#              SUBCLASS OF top
-#              MUST CONTAIN {
-#              userid}
-#              MAY CONTAIN {
-#              description,
-#              seeAlso,
-#              localityName,
-#               organizationName,
-#               organizationalUnitName,
-#               host}
-#               ::= {pilotObjectClass 5}
-#
-#
-# RFC-2256     ( 2.5.6.14 NAME 'device' SUP top STRUCTURAL MUST cn
-#               MAY ( serialNumber $ seeAlso $ owner $ ou $ o $ l $
-#               description ) )
-# RFC-1274     device OBJECT-CLASS
-#              SUBCLASS OF top
-#              MUST CONTAIN {
-#               commonName}
-#               MAY CONTAIN {
-#               description,
-#              localityName,
-#               organizationName,
-#               organizationalUnitName,
-#               owner,
-#               seeAlso,
-#               serialNumber}
-#               ::= {objectClass 14}
-#
-# ----------------------END FORMAL DESCRIPTION-------------
-#
-
-
-
-
-objectclass    top
-       requires
-               objectClass
-
-objectclass    organization
-       requires
-               objectClass,
-               o
-       allows
-               userPassword,
-               searchGuide,
-               seeAlso,
-               businessCategory,
-               x121Address,
-               registeredAddress,
-               destinationIndicator,
-               preferredDeliveryMethod,
-               telexNumber,
-               teletexTerminalIdentifier,
-               telephoneNumber,
-               internationaliSDNNumber,
-               facsimileTelephoneNumber,
-               street,
-               postOfficeBox,
-               postalCode,
-               postalAddress,
-               physicalDeliveryOfficeName,
-               st,
-               l,
-               description
-
-objectclass    account
-       requires
-               objectClass,
-               uid
-       allows
-               description,
-               seeAlso,
-               l,
-               o,
-               ou,
-               host
-
-objectclass    device
-       requires
-               objectClass,
-               cn      
-       allows
-               description,
-               l,
-               o,
-                ou,
-                owner,
-                seeAlso,
-                serialNumber
index 6a671b917bee452c6e89f927e30ba3c4f88edfa1..d1fdfb7ae7e79e95b8b3b201648ab88b72f9d195 100644 (file)
@@ -3,7 +3,11 @@ verify basic functionality of the LDAP libraries, slapd, and slurpd.
 
        To run all of the tests, type "make test".
        To run LDBM tests, type "make ldbm".
-       To run BDB2 tests, type "make bdb2".
 
 To modify the debug level the tests run slapd with, set the SLAPD_DEBUG
 environment variable.
+       env SLAPD_DEBUG=1 make test
+
+To test LDAPv3, set PROTO to "-P 3".
+       env PROTO="-P 3" make test
+
diff --git a/tests/data/slapd.at.conf b/tests/data/slapd.at.conf
deleted file mode 100644 (file)
index 1467748..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# $OpenLDAP$
-attribute      photo                                   bin
-attribute      personalsignature                       bin
-attribute      jpegphoto                               bin
-attribute      audio                                   bin
-attribute      labeledurl                              ces
-attribute      ref                                             ces
-attribute      userpassword                            bin
-attribute      telephonenumber                         tel
-attribute      facsimiletelephonenumber        fax     tel
-attribute      pagertelephonenumber            pager   tel
-attribute      homephone                               tel
-attribute      mobiletelephonenumber           mobile  tel
-attribute      aliasedObjectName                       dn
-attribute      member                                  dn
-attribute      owner                                   dn
-attribute      seealso                                 dn
-attribute      manager                                 dn
-attribute      documentauthor                          dn
-attribute      secretary                               dn
-attribute      lastmodifiedby                          dn
-attribute      associatedname                          dn
-attribute      naminglink                              dn
-attribute      reciprocalnaminglink                    dn
-attribute      dn                                      dn
diff --git a/tests/data/slapd.oc.conf b/tests/data/slapd.oc.conf
deleted file mode 100644 (file)
index 420182d..0000000
+++ /dev/null
@@ -1,952 +0,0 @@
-# $OpenLDAP$
-
-objectclass top
-       requires
-               objectClass
-
-objectclass ldapsubentry
-       requires
-               objectclass
-
-objectclass alias
-       requires
-               aliasedObjectName,
-               objectClass
-
-objectclass referral
-       requires
-               ref,
-               objectClass
-
-objectclass dcobject
-       requires
-               objectClass,
-               dc
-
-objectclass uidobject
-       requires
-               objectClass,
-               uid
-
-objectclass country
-       requires
-               objectClass,
-               c
-       allows
-               searchGuide,
-               description
-
-objectclass locality
-       requires
-               objectClass
-       allows
-               description,
-               l,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress
-
-objectclass organization
-       requires
-               objectClass,
-               o
-       allows
-               businessCategory,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass organizationalUnit
-       requires
-               objectClass,
-               ou
-       allows
-               businessCategory,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass person
-       requires
-               objectClass,
-               sn,
-               cn
-       allows
-               description,
-               seeAlso,
-               telephoneNumber,
-               userPassword
-
-objectclass organizationalPerson
-       requires
-               objectClass,
-               sn,
-               cn
-       allows
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               ou,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               title,
-               userPassword,
-               x121Address
-
-objectclass organizationalRole
-       requires
-               objectClass,
-               cn
-       allows
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               ou,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               roleOccupant,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               x121Address
-
-objectclass groupOfNames
-       requires
-               objectClass,
-               member,
-               cn
-       allows
-               businessCategory,
-               description,
-               o,
-               ou,
-               owner,
-               seeAlso
-
-objectclass residentialPerson
-       requires
-               objectClass,
-               sn,
-               cn,
-               l
-       allows
-               businessCategory,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass applicationProcess
-       requires
-               objectClass,
-               cn
-       allows
-               description,
-               l,
-               ou,
-               seeAlso
-
-objectclass applicationEntity
-       requires
-               objectClass,
-               presentationAddress,
-               cn
-       allows
-               description,
-               l,
-               o,
-               ou,
-               seeAlso,
-               supportedApplicationContext
-
-objectclass dSA
-       requires
-               objectClass,
-               presentationAddress,
-               cn
-       allows
-               knowledgeInformation
-
-objectclass device
-       requires
-               objectClass,
-               cn
-       allows
-               description,
-               l,
-               o,
-               ou,
-               owner,
-               seeAlso,
-               serialNumber
-
-objectclass strongAuthenticationUser
-       requires
-               objectClass,
-               userCertificate
-
-objectclass certificationAuthority
-       requires
-               objectClass,
-               authorityRevocationList,
-               certificateRevocationList,
-               cACertificate
-       allows
-               crossCertificatePair
-
-objectclass pilotObject
-       requires
-               objectClass
-       allows
-               audio,
-               dITRedirect,
-               info,
-               jpegPhoto,
-               lastModifiedBy,
-               lastModifiedTime,
-               manager,
-               photo,
-               uniqueIdentifier
-
-objectclass newPilotPerson
-       requires
-               objectClass,
-               sn,
-               cn
-       allows
-               businessCategory,
-               description,
-               drink,
-               homePhone,
-               homePostalAddress,
-               janetMailbox,
-               mail,
-               mailPreferenceOption,
-               mobile,
-               organizationalStatus,
-               otherMailbox,
-               pager,
-               personalSignature,
-               personalTitle,
-               preferredDeliveryMethod,
-               roomNumber,
-               secretary,
-               seeAlso,
-               telephoneNumber,
-               textEncodedORaddress,
-               uid,
-               userClass,
-               userPassword
-
-objectclass account
-       requires
-               objectClass,
-               uid
-       allows
-               description,
-               host,
-               l,
-               o,
-               ou,
-               seeAlso
-
-objectclass document
-       requires
-               objectClass,
-               documentIdentifier
-       allows
-               abstract,
-               audio,
-               authorCN,
-               authorSN,
-               cn,
-               dITRedirect,
-               description,
-               documentAuthor,
-               documentLocation,
-               documentPublisher,
-               documentStore,
-               documentTitle,
-               documentVersion,
-               info,
-               jpegPhoto,
-               keywords,
-               l,
-               lastModifiedBy,
-               lastModifiedTime,
-               manager,
-               o,
-               obsoletedByDocument,
-               obsoletesDocument,
-               ou,
-               photo,
-               seeAlso,
-               subject,
-               uniqueIdentifier,
-               updatedByDocument,
-               updatesDocument
-
-objectclass room
-       requires
-               objectClass,
-               cn
-       allows
-               description,
-               roomNumber,
-               seeAlso,
-               telephoneNumber
-
-objectclass documentSeries
-       requires
-               objectClass,
-               cn
-       allows
-               description,
-               l,
-               o,
-               ou,
-               seeAlso,
-               telephoneNumber
-
-objectclass domain
-       requires
-               objectClass,
-               dc
-       allows
-               associatedName,
-               businessCategory,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               o,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass rFC822localPart
-       requires
-               objectClass,
-               dc
-       allows
-               associatedName,
-               businessCategory,
-               cn,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               o,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               sn,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass dNSDomain
-       requires
-               objectClass,
-               dc
-       allows
-               associatedName,
-               businessCategory,
-               dNSRecord,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               o,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass domainRelatedObject
-       requires
-               objectClass,
-               associatedDomain
-
-objectclass friendlyCountry
-       requires
-               objectClass,
-               c,
-               co
-       allows
-               description,
-               searchGuide
-
-objectclass simpleSecurityObject
-       requires
-               objectClass,
-               userPassword
-
-objectclass pilotOrganization
-       requires
-               objectClass,
-               ou,
-               o
-       allows
-               buildingName,
-               businessCategory,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass nadfObject
-       requires
-               objectClass
-       allows
-               lastModifiedTime,
-               nadfSearchGuide,
-               supplementaryInformation
-
-objectclass usStateOrEquivalent
-       requires
-               objectClass,
-               st,
-               fipsStateAlphaCode,
-               fipsStateNumericCode,
-               l
-       allows
-               description,
-               lastModifiedTime,
-               nadfSearchGuide,
-               searchGuide,
-               seeAlso,
-               streetAddress,
-               supplementaryInformation
-
-objectclass usPlace
-       requires
-               objectClass,
-               fips55,
-               l
-       allows
-               description,
-               lastModifiedTime,
-               nadfSearchGuide,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               supplementaryInformation
-
-objectclass usCountyOrEquivalent
-       requires
-               objectClass,
-               fipsCountyNumericCode,
-               fips55,
-               l
-       allows
-               description,
-               lastModifiedTime,
-               nadfSearchGuide,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               supplementaryInformation
-
-objectclass ansiOrgObject
-       requires
-               objectClass,
-               ansiOrgNumericCode
-
-objectclass nadfApplicationEntity
-       requires
-               objectClass,
-               supportedApplicationContext,
-               presentationAddress,
-               cn
-       allows
-               description,
-               l,
-               o,
-               ou,
-               seeAlso,
-               supportedApplicationContext
-
-objectclass nadfADDMD
-       requires
-               objectClass,
-               ad
-       allows
-               businessCategory,
-               description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               l,
-               lastModifiedTime,
-               nadfSearchGuide,
-               o,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               searchGuide,
-               seeAlso,
-               st,
-               streetAddress,
-               supplementaryInformation,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address
-
-objectclass publicObject
-       requires
-               objectClass,
-               namingLink
-
-objectclass providerObject
-       requires
-               objectClass,
-               reciprocalNamingLink
-
-objectclass nationalObject
-       requires
-               objectClass,
-               c
-
-objectclass fips55Object
-       requires
-               objectClass,
-               fips55
-       allows
-               st
-
-objectclass restaurant
-       requires
-               objectClass,
-               description,
-               telephoneNumber,
-               streetAddress
-       allows
-               Ambiance,
-               Appearance,
-               Average-price,
-               Closed,
-               CreditCardsAccepted,
-               Kosher,
-               Max-price,
-               MaximumInParty,
-               Min-price,
-               Music,
-               NotRecommended,
-               OutdoorSeating,
-               Parking,
-               QualityOfService,
-               QualityPriceRatio,
-               Recommended,
-               RecommendedBy,
-               Reservation,
-               ServiceSpeed,
-               Specialty,
-               Taux-de-frequentation,
-               TransportationMeans,
-               facsimileTelephoneNumber,
-               postalAddress
-
-objectclass kerberosSecurityObject
-       requires
-               objectClass,
-               krbName
-
-objectclass inetOrgPerson
-       requires
-               objectClass,
-        cn,
-               sn
-       allows
-        description,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-        internationaliSDNNumber,
-               l,
-               ou,
-               physicalDeliveryOfficeName,
-        postalAddress,
-               postalCode,
-               postOfficeBox,
-        preferredDeliveryMethod,
-               registeredAddress,
-               seeAlso,
-        st,
-               street,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-        telexNumber,
-               title,
-               userPassword,
-               x121Address
-
-objectclass umichPerson
-       requires
-               objectClass,
-               sn,
-               cn,
-               universityID
-       allows
-               affiliationCode,
-               audio,
-               businessCategory,
-               classStanding,
-               description,
-               destinationIndicator,
-               doNotDelete,
-               doNotMove,
-               drink,
-               expire,
-               facsimileTelephoneNumber,
-               homePhone,
-               homePostalAddress,
-               internationaliSDNNumber,
-               janetMailbox,
-               jpegPhoto,
-               keepNames,
-               krbName,
-               l,
-               labeledURL,
-               mail,
-               mailPreferenceOption,
-               memberOfGroup,
-               mobile,
-               multiLineDescription,
-               noBatchUpdates,
-               notRegistered,
-               notice,
-               onVacation,
-               organizationalStatus,
-               otherMailbox,
-               ou,
-               pager,
-               personalSignature,
-               personalTitle,
-               photo,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               proxy,
-               registeredAddress,
-               registrationStatus,
-               roomNumber,
-               secretary,
-               seeAlso,
-               st,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               textEncodedORaddress,
-               title,
-               uid,
-               updateSource,
-               userCertificate,
-               userClass,
-               userPassword,
-               vacationMessage,
-               x121Address,
-               xacl
-
-objectclass rfc822MailGroup
-       requires
-               objectClass,
-               owner,
-               cn
-       allows
-               associatedDomain,
-               autoMgt,
-               description,
-               destinationIndicator,
-               errorsTo,
-               facsimileTelephoneNumber,
-               internationaliSDNNumber,
-               joinable,
-               krbName,
-               labeledURL,
-               mail,
-               member,
-               memberOfGroup,
-               moderator,
-               multiLineDescription,
-               notice,
-               physicalDeliveryOfficeName,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               registeredAddress,
-               requestsTo,
-               rfc822ErrorsTo,
-               rfc822RequestsTo,
-               seeAlso,
-               streetAddress,
-               suppressNoEmailError,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               userPassword,
-               x121Address,
-               xacl
-
-objectclass image
-       requires
-               objectClass,
-               cn
-       allows
-               citation,
-               copyright,
-               imageFiles,
-               jpegPhoto,
-               keywords,
-               multiLineDescription,
-               owner,
-               predominantColor
-
-objectclass imageFile
-       requires
-               objectClass,
-               cn
-       allows
-               colorDepth,
-               documentLocation,
-               fileFormat,
-               fileSize,
-               height,
-               resolution,
-               seeAlso,
-               width
-
-objectclass service
-       requires
-               objectClass,
-               cn
-       allows
-               category,
-               dependentUpon,
-               destinationIndicator,
-               facsimileTelephoneNumber,
-               hoursOfOperation,
-               internationaliSDNNumber,
-               jpegPhoto,
-               keywords,
-               labeledURL,
-               mail,
-               multiLineDescription,
-               owner,
-               physicalDeliveryOfficeName,
-               platform,
-               postOfficeBox,
-               postalAddress,
-               postalCode,
-               preferredDeliveryMethod,
-               product,
-               provider,
-               ratingDescription,
-               ratingTime,
-               registeredAddress,
-               seeAlso,
-               serviceArea,
-               serviceRating,
-               streetAddress,
-               telephoneNumber,
-               teletexTerminalIdentifier,
-               telexNumber,
-               x121Address
-
-objectclass umichDocument
-       requires
-               objectClass,
-               documentIdentifier
-       allows
-               abstract,
-               audio,
-               authorCN,
-               authorSN,
-               category,
-               cn,
-               dITRedirect,
-               description,
-               documentAuthor,
-               documentAvailable,
-               documentLocation,
-               documentPublisher,
-               documentSeriesTitle,
-               documentStore,
-               documentTitle,
-               documentVersion,
-               info,
-               jpegPhoto,
-               keywords,
-               l,
-               labeledURL,
-               lastModifiedBy,
-               lastModifiedTime,
-               manager,
-               multiLineAbstract,
-               o,
-               obsoletedByDocument,
-               obsoletesDocument,
-               ou,
-               owner,
-               photo,
-               platform,
-               product,
-               seeAlso,
-               serviceArea,
-               subject,
-               uniqueIdentifier,
-               updatedByDocument,
-               updatesDocument
-
-objectclass documentDescription
-       requires
-               objectClass,
-               cn
-       allows
-               labeledURL,
-               multiLineDescription,
-               owner
-
-objectclass labeledURLObject
-       requires
-               objectClass
-       allows
-               labeledURL
-
-objectclass cacheObject
-       requires
-               objectClass
-       allows
-               ttl