Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

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

diff --git a/servers/slapd/schema/nadf.schema b/servers/slapd/schema/nadf.schema
index a5b8f20689463d1347e3c05087d8293f5c8b8acf..576ae7c1ce4cc17b4dfec3c8c6218342d0d3fe16 100644 (file)
--- a/servers/slapd/schema/nadf.schema
+++ b/servers/slapd/schema/nadf.schema
@@ -1,11 +1,27 @@
+# nadf.schema -- NADF-defined schema
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2009 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 # These are definitions from the North American Directory Forum
-# They were taken from ftp://ftp.gte.com/pub/nadf/nadf-docs/sd-04.ps
+# They are intended to be used with QUIPU/X.500 not LDAPv3.
+# Your mileage may vary.
+
+# 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,
@@ -16,9 +32,6 @@
 
 # Attribute Type Definition
 
-# The spec says "leading zero is significant".  Is this really a
-# numeric string?
-
 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} )
@@ -30,18 +43,12 @@ 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?
-
 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?
-
 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} )
@@ -93,12 +100,12 @@ attributetype ( 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 ) )