More CLDAP tweaks, to differentiate between real LDAPv2 CLDAP and "other"

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 0574dcde1802fe87d0fc7a2e6c9cb2d8f01ef6cd..16efb4c1ee26f02cf4db075b8e149b479e08f31a 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -15,6 +15,7 @@
 
 #include "slap.h"
 #include "ldap_pvt.h"
+#include "ldap_pvt_uc.h"
 
 int schema_init_done = 0;
 
@@ -59,8 +60,15 @@ objectClassMatch(
        }
 
 #if 0
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+                  "objectClassMatch(%s, %s) = %d\n",
+                  value->bv_val, a->bv_val, *matchp ));
+#else
        Debug( LDAP_DEBUG_TRACE, "objectClassMatch(%s,%s) = %d\n",
                value->bv_val, a->bv_val, *matchp );
+#endif
+
 #endif
 
        return LDAP_SUCCESS;
@@ -101,8 +109,15 @@ structuralObjectClassMatch(
        *matchp = ( asserted != oc );
 
 #if 0
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+                  "structuralObjectClassMatch( %s, %s ) = %d\n",
+                  value->bv_val, a->bv_val, *matchp ));
+#else
        Debug( LDAP_DEBUG_TRACE, "structuralObjectClassMatch(%s,%s) = %d\n",
                value->bv_val, a->bv_val, *matchp );
+#endif
+
 #endif
 
        return LDAP_SUCCESS;
@@ -160,6 +175,8 @@ struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_supportedLDAPVersion) },
        { "supportedSASLMechanisms", NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_supportedSASLMechanisms) },
+       { "supportedFeatures", NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_supportedFeatures) },
 
        /* subschema subentry attributes */
        { "attributeTypes", NULL, NULL, NULL,