ITS#2607: improve socket() error logging with AF info

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

diff --git a/servers/slapd/schema/nadf.schema b/servers/slapd/schema/nadf.schema
index c048872370fdafcc785407b3fb22b99f852a7770..1da0e5396f2f330c11e5ed02cae7dc8ba8a357b9 100644 (file)
--- a/servers/slapd/schema/nadf.schema
+++ b/servers/slapd/schema/nadf.schema
@@ -1,13 +1,14 @@
+# $OpenLDAP$
 
 # These are definitions from the North American Directory Forum
-# They were taken from ftp://ftp.gte.com/pub/nadf/nadf-docs/sd-04.ps
-# Our thanks to Harald T. Alvestrand that provided the pointer.
+# They are intended to be used with QUIPU/X.500 not LDAPv3.
+# Your mileage may vary.
 
-# Some attribute types and object classes defined in the spec
-# and that we did not have are not included in this file.
+# They were acquired from ftp://ftp.gte.com/pub/nadf/nadf-docs/sd-04.ps
+# Our thanks to Harald T. Alvestrand that provided the pointer.
 
 # This is a preliminary version and is likely to be incorrect in
-# a number of areas
+# a number of areas.  Use with exterme caution.
 
 # The root for OIDs is joint-iso-ccitt mhs-motis(6) group(6) grimstad(5)
 # nadf(2).  In othor words, barring any error, 2.6.6.5.2.  Then,
@@ -18,65 +19,51 @@
 
 # Attribute Type Definition
 
-attribute ( 2.5.18.1 NAME 'createTimestamp' EQUALITY generalizedTimeMatch
-      ORDERING generalizedTimeOrderingMatch
-      SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-      SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )
-
-# The spec says "leading zero is significant".  Is this really a
-# numeric string?
-
-attribute ( 2.6.6.5.2.4.1 NAME 'fipsStateNumericCode'
+attributetype ( 2.6.6.5.2.4.1 NAME 'fipsStateNumericCode'
        EQUALITY numericStringMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{2} )
 
 # It is probably inconvenient to give this attribute that syntax
 # (Printable String) instead of Directory String.
 
-attribute ( 2.6.6.5.2.4.2 NAME 'fipsStateAlphaCode'
+attributetype ( 2.6.6.5.2.4.2 NAME 'fipsStateAlphaCode'
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{2} )
 
-# The spec says "leading zeros are significant".  Is this really a
-# numeric string?
-
-attribute ( 2.6.6.5.2.4.3 NAME 'fipsCountyNumericCode'
+attributetype ( 2.6.6.5.2.4.3 NAME 'fipsCountyNumericCode'
        EQUALITY numericStringMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{5} )
 
 # It seems that fips55 is fipsPlaceNumericCode, is this so?
 
-# The spec says "leading zeros are significant".  Is this really a
-# numeric string?
-
-attribute ( 2.6.6.5.2.4.4 NAME ( 'fipsPlaceNumericCode' 'fips55' )
+attributetype ( 2.6.6.5.2.4.4 NAME ( 'fipsPlaceNumericCode' 'fips55' )
        EQUALITY numericStringMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{5} )
 
-attribute ( 2.6.6.5.2.4.5 NAME 'ansiOrgNumericCode'
+attributetype ( 2.6.6.5.2.4.5 NAME 'ansiOrgNumericCode'
        EQUALITY integerMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 # Apparently, 'ad' is an alias for 'addmdName'
 
-attribute ( 2.6.6.5.2.4.6 NAME ( 'addmdName' 'ad' )
+attributetype ( 2.6.6.5.2.4.6 NAME ( 'addmdName' 'ad' )
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 # I don't know what syntax to give this.  I will use binary for the
 # time being.
 
-attribute ( 2.6.6.5.2.4.7 NAME 'nadfSearchGuide'
+attributetype ( 2.6.6.5.2.4.7 NAME 'nadfSearchGuide'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
 
-attribute ( 2.6.6.5.2.4.8 NAME 'supplementaryInformation'
+attributetype ( 2.6.6.5.2.4.8 NAME 'supplementaryInformation'
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{76} )
 
-attribute ( 2.6.6.5.2.4.9 NAME 'namingLink'
+attributetype ( 2.6.6.5.2.4.9 NAME 'namingLink'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attribute ( 2.6.6.5.2.4.10 NAME 'reciprocalNamingLink'
+attributetype ( 2.6.6.5.2.4.10 NAME 'reciprocalNamingLink'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
        SINGLE-VALUE )
 
@@ -87,11 +74,11 @@ attribute ( 2.6.6.5.2.4.10 NAME 'reciprocalNamingLink'
 # define the string with IA5 syntax and we don't have a
 # clear base for this.
 
-attribute ( 2.6.6.5.2.4.15 NAME 'logicalDSAReference'
+attributetype ( 2.6.6.5.2.4.15 NAME 'logicalDSAReference'
        EQUALITY caseIgnoreMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attribute ( 2.6.6.5.2.4.16 NAME 'multiMediaInformation'
+attributetype ( 2.6.6.5.2.4.16 NAME 'multiMediaInformation'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
 
 # Number 17, 18 and 19 are EDI-related attributes for the nadfEDIUser
@@ -100,12 +87,12 @@ attribute ( 2.6.6.5.2.4.16 NAME 'multiMediaInformation'
 # Object classes
 
 # According to the intended use described in section 3.3.1 in the spec,
-# this can only be AUXILIARY.
+# this can only be ABSTRACT.
 # We had lastModifiedTime as 'allows', but sd-04 has it as MUST.
 # We did not have multiMediaInformation neither on this class nor
 # on any of its derived classes.
 
-objectclass ( 2.6.6.5.2.6.7 NAME 'nadfObject' SUP top AUXILIARY
+objectclass ( 2.6.6.5.2.6.7 NAME 'nadfObject' SUP top ABSTRACT
        MUST lastModifiedTime
        MAY ( multiMediaInformation $ nadfSearchGuide $
        supplementaryInformation ) )