syntax oid macros added

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index aec27c8f71f381cb8e1d63e76ee0ce05c9f2d718..5bab4a2d0a927475540304ea6ef414d01e79b099 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -532,12 +532,12 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_collectiveExclusions) },
 #endif
 
-       { "entryDN", "( 1.3.6.1.4.1.4203.666.1.33 NAME 'entryDN' "   
+       { "entryDN", "( 1.3.6.1.1.20 NAME 'entryDN' "   
                        "DESC 'DN of the entry' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
-               NULL, SLAP_AT_HIDE|SLAP_AT_DYNAMIC,
+               NULL, SLAP_AT_DYNAMIC,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryDN) },
@@ -690,7 +690,7 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_monitorContext) },
-       { "configContext", "( 1.3.6.1.4.1.4203.666.11.1.1 "
+       { "configContext", "( 1.3.6.1.4.1.4203.1.12.2.1 "
                        "NAME 'configContext' "
                        "DESC 'config context' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
@@ -1019,6 +1019,7 @@ static AttributeType slap_at_undefined = {
        NULL, /* syntax (will be set later to "octetString") */
        NULL, /* schema check function */
        NULL, /* oidmacro */
+       NULL, /* soidmacro */
        SLAP_AT_ABSTRACT|SLAP_AT_FINAL, /* mask */
        { NULL }, /* next */
        NULL /* attribute description */
@@ -1036,6 +1037,7 @@ static AttributeType slap_at_proxied = {
        NULL, /* syntax (will be set later to "octetString") */
        NULL, /* schema check function */
        NULL, /* oidmacro */
+       NULL, /* soidmacro */
        SLAP_AT_ABSTRACT|SLAP_AT_FINAL, /* mask */
        { NULL }, /* next */
        NULL /* attribute description */