Misc RFC reference updates

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 0369e3dcb74281cce7fde5d227bfac26ae94cb1b..cb0135e909d46195837253435b7c74e38b7df924 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -187,12 +187,12 @@ N_("  -C         chase referrals (anonymously)\n"),
 N_("  -d level   set LDAP debugging level to `level'\n"),
 N_("  -D binddn  bind DN\n"),
 N_("  -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n")
-N_("             [!]assert=<filter>     (an RFC 2254 Filter)\n")
+N_("             [!]assert=<filter>     (a RFC 4515 Filter string)\n")
 N_("             [!]authzid=<authzid>   (\"dn:<dn>\" or \"u:<user>\")\n")
 #ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
 #if 0
                  /* non-advertized support for proxyDN */
-N_("             [!]proxydn=<dn>        (an RFC 2253 DN)\n")
+N_("             [!]proxydn=<dn>        (a RFC 4514 DN string)\n")
 #endif
 #endif
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 04840c421881d098d885c54ea045f6f710238aa3..e02ba915c89a97644c0fed1f7e5c53c1bca868e8 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -109,7 +109,7 @@ void
 usage( void )
 {
        fprintf( stderr, _("usage: %s [options] [filter [attributes...]]\nwhere:\n"), prog);
-       fprintf( stderr, _("  filter\tRFC-2254 compliant LDAP search filter\n"));
+       fprintf( stderr, _("  filter\tRFC 4515 compliant LDAP search filter\n"));
        fprintf( stderr, _("  attributes\twhitespace-separated list of attribute descriptions\n"));
        fprintf( stderr, _("    which may include:\n"));
        fprintf( stderr, _("      1.1   no attributes\n"));

diff --git a/include/ldap.h b/include/ldap.h
index c567d6adcc0389b41f205d4b6d12286f1bf4dc33..c6a3fcf2dc67e95ad7f9009e62357a477fc0452d 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -76,7 +76,7 @@ LDAP_BEGIN_DECL
 #define LDAP_ALL_USER_ATTRIBUTES       "*"
 #define LDAP_ALL_OPERATIONAL_ATTRIBUTES        "+" /* RFC 3673 */
 
-/* RFC 2251:  maxInt INTEGER ::= 2147483647 -- (2^^31 - 1) -- */
+/* RFC 4511:  maxInt INTEGER ::= 2147483647 -- (2^^31 - 1) -- */
 #define LDAP_MAXINT (2147483647)
 
 /*
@@ -124,7 +124,7 @@ LDAP_BEGIN_DECL
 
 /* OpenLDAP TLS options */
 #define LDAP_OPT_X_TLS                         0x6000
-#define LDAP_OPT_X_TLS_CTX                     0x6001  /* SSL CTX */
+#define LDAP_OPT_X_TLS_CTX                     0x6001  /* OpenSSL CTX */
 #define LDAP_OPT_X_TLS_CACERTFILE      0x6002
 #define LDAP_OPT_X_TLS_CACERTDIR       0x6003
 #define LDAP_OPT_X_TLS_CERTFILE                0x6004
@@ -212,9 +212,9 @@ typedef struct ldapcontrol {
 
 #define LDAP_CONTROL_VALUESRETURNFILTER "1.2.826.0.1.3344810.2.3"/* RFC 3876 */
 
-#define LDAP_CONTROL_ASSERT                            "1.3.6.1.1.12"                  /* RFC TBD */
-#define LDAP_CONTROL_PRE_READ                  "1.3.6.1.1.13.1"                /* RFC TBD */
-#define LDAP_CONTROL_POST_READ                 "1.3.6.1.1.13.2"                /* RFC TBD */
+#define LDAP_CONTROL_ASSERT                            "1.3.6.1.1.12"                  /* RFC 4528 */
+#define LDAP_CONTROL_PRE_READ                  "1.3.6.1.1.13.1"                /* RFC 4527 */
+#define LDAP_CONTROL_POST_READ                 "1.3.6.1.1.13.2"                /* RFC 4527 */
 
 /*  standard track - not implemented in slapd(8) */
 #define LDAP_CONTROL_SORTREQUEST    "1.2.840.113556.1.4.473" /* RFC 2891 */
@@ -223,7 +223,7 @@ typedef struct ldapcontrol {
 /*     non-standard track controls */
 #define LDAP_CONTROL_PAGEDRESULTS      "1.2.840.113556.1.4.319"   /* RFC 2696 */
 
-/* LDAP Sync -- draft-zeilenga-ldup-sync *//* RFC TBD */
+/* LDAP Content Synchronization Operation -- RFC 4533 */
 #define LDAP_SYNC_OID                  "1.3.6.1.4.1.4203.1.9.1"
 #define LDAP_CONTROL_SYNC              LDAP_SYNC_OID ".1"
 #define LDAP_CONTROL_SYNC_STATE        LDAP_SYNC_OID ".2"
@@ -313,11 +313,11 @@ typedef struct ldapcontrol {
 
 
 /* LDAP Unsolicited Notifications */
-#define        LDAP_NOTICE_OF_DISCONNECTION    "1.3.6.1.4.1.1466.20036" /* RFC 2251 */
+#define        LDAP_NOTICE_OF_DISCONNECTION    "1.3.6.1.4.1.1466.20036" /* RFC 4511 */
 #define LDAP_NOTICE_DISCONNECT LDAP_NOTICE_OF_DISCONNECTION
 
 /* LDAP Extended Operations */
-#define LDAP_EXOP_START_TLS            "1.3.6.1.4.1.1466.20037"        /* RFC 2830 */
+#define LDAP_EXOP_START_TLS            "1.3.6.1.4.1.1466.20037"        /* RFC 4511 */
 
 #define LDAP_EXOP_MODIFY_PASSWD        "1.3.6.1.4.1.4203.1.11.1"       /* RFC 3062 */
 #define LDAP_TAG_EXOP_MODIFY_PASSWD_ID ((ber_tag_t) 0x80U)
@@ -325,7 +325,7 @@ typedef struct ldapcontrol {
 #define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW        ((ber_tag_t) 0x82U)
 #define LDAP_TAG_EXOP_MODIFY_PASSWD_GEN        ((ber_tag_t) 0x80U)
 
-#define LDAP_EXOP_CANCEL               "1.3.6.1.1.8"                           /* RFC 3909 */
+#define LDAP_EXOP_CANCEL               "1.3.6.1.1.8"                                   /* RFC 3909 */
 #define LDAP_EXOP_X_CANCEL             LDAP_EXOP_CANCEL
 
 #define        LDAP_EXOP_REFRESH               "1.3.6.1.4.1.1466.101.119.1"    /* RFC 2589 */
@@ -333,12 +333,12 @@ typedef struct ldapcontrol {
 #define        LDAP_TAG_EXOP_REFRESH_REQ_TTL   ((ber_tag_t) 0x81U)
 #define        LDAP_TAG_EXOP_REFRESH_RES_TTL   ((ber_tag_t) 0x80U)
 
-#define LDAP_EXOP_WHO_AM_I             "1.3.6.1.4.1.4203.1.11.3"
+#define LDAP_EXOP_WHO_AM_I             "1.3.6.1.4.1.4203.1.11.3"               /* RFC 4532 */
 #define LDAP_EXOP_X_WHO_AM_I   LDAP_EXOP_WHO_AM_I
 
 /* various works in progress */
 #ifdef LDAP_DEVEL
-#define LDAP_EXOP_X_TURN               "1.3.6.1.4.1.4203.666.6.4"
+#define LDAP_EXOP_X_TURN               "1.3.6.1.4.1.4203.666.6.4"              /* RFC 4531 */
 #endif
 
 /* LDAP Distributed Procedures <draft-sermersheim-ldap-distproc> */
@@ -2060,7 +2060,7 @@ ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
 #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
 
 /*
- * LDAP Dynamic Directory Services Refresh RFC2589
+ * LDAP Dynamic Directory Services Refresh -- RFC 2589
  *     in dds.c
  */
 #define LDAP_API_FEATURE_REFRESH 1000

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 881ca16251e8569b3733b3da87b5b9c5db0d473d..85717e2c04a70fd006ed89ea1381f4c85dcd6e44 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -338,12 +338,12 @@ static struct slap_schema_oc_map {
                0, 0, offsetof(struct slap_internal_schema, si_oc_top) },
        { "extensibleObject", "( 1.3.6.1.4.1.1466.101.120.111 "
                        "NAME 'extensibleObject' "
-                       "DESC 'RFC2252: extensible object' "
+                       "DESC 'RFC4512: extensible object' "
                        "SUP top AUXILIARY )",
                0, SLAP_OC_OPERATIONAL,
                offsetof(struct slap_internal_schema, si_oc_extensibleObject) },
        { "alias", "( 2.5.6.1 NAME 'alias' "
-                       "DESC 'RFC2256: an alias' "
+                       "DESC 'RFC4512: an alias' "
                        "SUP top STRUCTURAL "
                        "MUST aliasedObjectName )",
                aliasObjectClass, SLAP_OC_ALIAS|SLAP_OC_OPERATIONAL,
@@ -360,12 +360,13 @@ static struct slap_schema_oc_map {
                rootDseObjectClass, SLAP_OC_OPERATIONAL,
                offsetof(struct slap_internal_schema, si_oc_rootdse) },
        { "subentry", "( 2.5.17.0 NAME 'subentry' "
+                       "DESC 'RFC3672: subentry' "
                        "SUP top STRUCTURAL "
                        "MUST ( cn $ subtreeSpecification ) )",
                subentryObjectClass, SLAP_OC_SUBENTRY|SLAP_OC_OPERATIONAL,
                offsetof(struct slap_internal_schema, si_oc_subentry) },
        { "subschema", "( 2.5.20.1 NAME 'subschema' "
-               "DESC 'RFC2252: controlling subschema (sub)entry' "
+               "DESC 'RFC4512: controlling subschema (sub)entry' "
                "AUXILIARY "
                "MAY ( dITStructureRules $ nameForms $ ditContentRules $ "
                        "objectClasses $ attributeTypes $ matchingRules $ "
@@ -438,7 +439,7 @@ static struct slap_schema_ad_map {
        size_t ssam_offset;
 } ad_map[] = {
        { "objectClass", "( 2.5.4.0 NAME 'objectClass' "
-                       "DESC 'RFC2256: object classes of the entity' "
+                       "DESC 'RFC4512: object classes of the entity' "
                        "EQUALITY objectIdentifierMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
                NULL, SLAP_AT_FINAL,
@@ -449,7 +450,7 @@ static struct slap_schema_ad_map {
 
        /* user entry operational attributes */
        { "structuralObjectClass", "( 2.5.21.9 NAME 'structuralObjectClass' "
-                       "DESC 'X.500(93): structural object class of entry' "
+                       "DESC 'RFC4512: structural object class of entry' "
                        "EQUALITY objectIdentifierMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -459,7 +460,7 @@ static struct slap_schema_ad_map {
                        objectSubClassIndexer, objectSubClassFilter,
                offsetof(struct slap_internal_schema, si_ad_structuralObjectClass) },
        { "createTimestamp", "( 2.5.18.1 NAME 'createTimestamp' "
-                       "DESC 'RFC2252: time which object was created' "
+                       "DESC 'RFC4512: time which object was created' "
                        "EQUALITY generalizedTimeMatch "
                        "ORDERING generalizedTimeOrderingMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
@@ -469,7 +470,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_createTimestamp) },
        { "modifyTimestamp", "( 2.5.18.2 NAME 'modifyTimestamp' "
-                       "DESC 'RFC2252: time which object was last modified' "
+                       "DESC 'RFC4512: time which object was last modified' "
                        "EQUALITY generalizedTimeMatch "
                        "ORDERING generalizedTimeOrderingMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
@@ -479,7 +480,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_modifyTimestamp) },
        { "creatorsName", "( 2.5.18.3 NAME 'creatorsName' "
-                       "DESC 'RFC2252: name of creator' "
+                       "DESC 'RFC4512: name of creator' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -488,7 +489,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_creatorsName) },
        { "modifiersName", "( 2.5.18.4 NAME 'modifiersName' "
-                       "DESC 'RFC2252: name of last modifier' "
+                       "DESC 'RFC4512: name of last modifier' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -506,7 +507,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_hasSubordinates) },
        { "subschemaSubentry", "( 2.5.18.10 NAME 'subschemaSubentry' "
-                       "DESC 'RFC2252: name of controlling subschema entry' "
+                       "DESC 'RFC4512: name of controlling subschema entry' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE "
                        "NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -628,7 +629,7 @@ static struct slap_schema_ad_map {
 
        /* root DSE attributes */
        { "altServer", "( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' "
-                       "DESC 'RFC2252: alternative servers' "
+                       "DESC 'RFC4512: alternative servers' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 USAGE dSAOperation )",
                rootDseAttribute, 0,
                NULL, NULL,
@@ -636,7 +637,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_altServer) },
        { "namingContexts", "( 1.3.6.1.4.1.1466.101.120.5 "
                        "NAME 'namingContexts' "
-                       "DESC 'RFC2252: naming contexts' "
+                       "DESC 'RFC4512: naming contexts' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 USAGE dSAOperation )",
                rootDseAttribute, 0,
                NULL, NULL,
@@ -644,7 +645,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_namingContexts) },
        { "supportedControl", "( 1.3.6.1.4.1.1466.101.120.13 "
                        "NAME 'supportedControl' "
-                       "DESC 'RFC2252: supported controls' "
+                       "DESC 'RFC4512: supported controls' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )",
                rootDseAttribute, 0,
                NULL, NULL,
@@ -652,7 +653,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_supportedControl) },
        { "supportedExtension", "( 1.3.6.1.4.1.1466.101.120.7 "
                        "NAME 'supportedExtension' "
-                       "DESC 'RFC2252: supported extended operations' "
+                       "DESC 'RFC4512: supported extended operations' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 USAGE dSAOperation )",
                rootDseAttribute, 0,
                NULL, NULL,
@@ -660,7 +661,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_supportedExtension) },
        { "supportedLDAPVersion", "( 1.3.6.1.4.1.1466.101.120.15 "
                        "NAME 'supportedLDAPVersion' "
-                       "DESC 'RFC2252: supported LDAP versions' "
+                       "DESC 'RFC4512: supported LDAP versions' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 USAGE dSAOperation )",
                rootDseAttribute, 0,
                NULL, NULL,
@@ -668,7 +669,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_supportedLDAPVersion) },
        { "supportedSASLMechanisms", "( 1.3.6.1.4.1.1466.101.120.14 "
                        "NAME 'supportedSASLMechanisms' "
-                       "DESC 'RFC2252: supported SASL mechanisms'"
+                       "DESC 'RFC4512: supported SASL mechanisms'"
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE dSAOperation )",
                rootDseAttribute, 0,
                NULL, NULL,
@@ -676,7 +677,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_supportedSASLMechanisms) },
        { "supportedFeatures", "( 1.3.6.1.4.1.4203.1.3.5 "
                        "NAME 'supportedFeatures' "
-                       "DESC 'features supported by the server' "
+                       "DESC 'RFC4512: features supported by the server' "
                        "EQUALITY objectIdentifierMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
                        "USAGE dSAOperation )",
@@ -727,6 +728,7 @@ static struct slap_schema_ad_map {
 
        /* subentry attributes */
        { "administrativeRole", "( 2.5.18.5 NAME 'administrativeRole' "
+                       "DESC 'RFC3672: administrative role' "
                        "EQUALITY objectIdentifierMatch "
                        "USAGE directoryOperation "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
@@ -735,6 +737,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_administrativeRole) },
        { "subtreeSpecification", "( 2.5.18.6 NAME 'subtreeSpecification' "
+                       "DESC 'RFC3672: subtree specification' "
                        "SINGLE-VALUE "
                        "USAGE directoryOperation "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.45 )",
@@ -745,7 +748,7 @@ static struct slap_schema_ad_map {
 
        /* subschema subentry attributes */
        { "ditStructureRules", "( 2.5.21.1 NAME 'dITStructureRules' "
-                       "DESC 'RFC2252: DIT structure rules' "
+                       "DESC 'RFC4512: DIT structure rules' "
                        "EQUALITY integerFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.17 "
                        "USAGE directoryOperation ) ",
@@ -754,7 +757,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_ditStructureRules) },
        { "ditContentRules", "( 2.5.21.2 NAME 'dITContentRules' "
-                       "DESC 'RFC2252: DIT content rules' "
+                       "DESC 'RFC4512: DIT content rules' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.16 USAGE directoryOperation )",
                subentryAttribute, SLAP_AT_HIDE,
@@ -762,7 +765,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, objectClassMatch, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_ditContentRules) },
        { "matchingRules", "( 2.5.21.4 NAME 'matchingRules' "
-                       "DESC 'RFC2252: matching rules' "
+                       "DESC 'RFC4512: matching rules' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.30 USAGE directoryOperation )",
                subentryAttribute, 0,
@@ -770,7 +773,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, matchingRuleMatch, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_matchingRules) },
        { "attributeTypes", "( 2.5.21.5 NAME 'attributeTypes' "
-                       "DESC 'RFC2252: attribute types' "
+                       "DESC 'RFC4512: attribute types' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.3 USAGE directoryOperation )",
                subentryAttribute, 0,
@@ -778,7 +781,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, attributeTypeMatch, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_attributeTypes) },
        { "objectClasses", "( 2.5.21.6 NAME 'objectClasses' "
-                       "DESC 'RFC2252: object classes' "
+                       "DESC 'RFC4512: object classes' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.37 USAGE directoryOperation )",
                subentryAttribute, 0,
@@ -786,7 +789,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, objectClassMatch, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_objectClasses) },
        { "nameForms", "( 2.5.21.7 NAME 'nameForms' "
-                       "DESC 'RFC2252: name forms ' "
+                       "DESC 'RFC4512: name forms ' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.35 USAGE directoryOperation )",
                subentryAttribute, SLAP_AT_HIDE,
@@ -794,7 +797,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_nameForms) },
        { "matchingRuleUse", "( 2.5.21.8 NAME 'matchingRuleUse' "
-                       "DESC 'RFC2252: matching rule uses' "
+                       "DESC 'RFC4512: matching rule uses' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.31 USAGE directoryOperation )",
                subentryAttribute, 0,
@@ -803,7 +806,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_matchingRuleUse) },
 
        { "ldapSyntaxes", "( 1.3.6.1.4.1.1466.101.120.16 NAME 'ldapSyntaxes' "
-                       "DESC 'RFC2252: LDAP syntaxes' "
+                       "DESC 'RFC4512: LDAP syntaxes' "
                        "EQUALITY objectIdentifierFirstComponentMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.54 USAGE directoryOperation )",
                subentryAttribute, 0,
@@ -814,7 +817,7 @@ static struct slap_schema_ad_map {
        /* knowledge information */
        { "aliasedObjectName", "( 2.5.4.1 "
                        "NAME ( 'aliasedObjectName' 'aliasedEntryName' ) "
-                       "DESC 'RFC2256: name of aliased object' "
+                       "DESC 'RFC4512: name of aliased object' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )",
                aliasAttribute, SLAP_AT_FINAL,
@@ -822,7 +825,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_aliasedObjectName) },
        { "ref", "( 2.16.840.1.113730.3.1.34 NAME 'ref' "
-                       "DESC 'namedref: subordinate referral URL' "
+                       "DESC 'RFC3296: subordinate referral URL' "
                        "EQUALITY caseExactMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 "
                        "USAGE distributedOperation )",
@@ -897,7 +900,7 @@ static struct slap_schema_ad_map {
 
        /* userApplication attributes (which system schema depends upon) */
        { "distinguishedName", "( 2.5.4.49 NAME 'distinguishedName' "
-                       "DESC 'RFC2256: common supertype of DN attributes' "
+                       "DESC 'RFC4519: common supertype of DN attributes' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )",
                NULL, SLAP_AT_ABSTRACT,
@@ -905,7 +908,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_distinguishedName) },
        { "name", "( 2.5.4.41 NAME 'name' "
-                       "DESC 'RFC2256: common supertype of name attributes' "
+                       "DESC 'RFC4519: common supertype of name attributes' "
                        "EQUALITY caseIgnoreMatch "
                        "SUBSTR caseIgnoreSubstringsMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )",
@@ -914,14 +917,14 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_name) },
        { "cn", "( 2.5.4.3 NAME ( 'cn' 'commonName' ) "
-                       "DESC 'RFC2256: common name(s) for which the entity is known by' "
+                       "DESC 'RFC4519: common name(s) for which the entity is known by' "
                        "SUP name )",
                NULL, 0,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_cn) },
        { "uid", "( 0.9.2342.19200300.100.1.1 NAME ( 'uid' 'userid' ) "
-                       "DESC 'RFC1274: user identifier' "
+                       "DESC 'RFC4519: user identifier' "
                        "EQUALITY caseIgnoreMatch "
                        "SUBSTR caseIgnoreSubstringsMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )",
@@ -931,7 +934,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_uid) },
        { "uidNumber", /* for ldapi:// */
                "( 1.3.6.1.1.1.1.0 NAME 'uidNumber' "
-               "DESC 'An integer uniquely identifying a user "
+               "DESC 'RFC2307: An integer uniquely identifying a user "
                                "in an administrative domain' "
                "EQUALITY integerMatch "
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )",
@@ -941,7 +944,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_uidNumber) },
        { "gidNumber", /* for ldapi:// */
                "( 1.3.6.1.1.1.1.1 NAME 'gidNumber' "
-               "DESC 'An integer uniquely identifying a group "
+               "DESC 'RFC2307: An integer uniquely identifying a group "
                                "in an administrative domain' "
                "EQUALITY integerMatch "
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )",
@@ -950,7 +953,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_gidNumber) },
        { "userPassword", "( 2.5.4.35 NAME 'userPassword' "
-                       "DESC 'RFC2256/2307: password of user' "
+                       "DESC 'RFC4519/2307: password of user' "
                        "EQUALITY octetStringMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )",
                NULL, 0,
@@ -1002,7 +1005,7 @@ static struct slap_schema_ad_map {
 #endif
 
        { "description", "( 2.5.4.13 NAME 'description' "
-                       "DESC 'RFC2256: descriptive information' "
+                       "DESC 'RFC4519: descriptive information' "
                        "EQUALITY caseIgnoreMatch "
                        "SUBSTR caseIgnoreSubstringsMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )",
@@ -1012,7 +1015,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_description) },
 
        { "seeAlso", "( 2.5.4.34 NAME 'seeAlso' "
-                       "DESC 'RFC2256: DN of related object' "
+                       "DESC 'RFC4519: DN of related object' "
                        "SUP distinguishedName )",
                NULL, 0,
                NULL, NULL,