Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index d835f60182310ebb904586b237d1085c09f3e452..f5e32c07b48657ec8855f0f748b9a45f5b2edffb 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -44,7 +44,7 @@ oc_schema_check( Entry *e )
        for ( i = 0; aoc->a_vals[i] != NULL; i++ ) {
                if ( (oc = oc_find( aoc->a_vals[i]->bv_val )) == NULL ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "Objectclass \"%s\" not defined",
+                               "Objectclass \"%s\" not defined\n",
                                aoc->a_vals[i]->bv_val, 0, 0 );
                }
                else
@@ -164,6 +164,7 @@ static char *oc_operational_attrs[] = {
        "supportedControl",
        "supportedSASLMechanisms",
        "supportedLDAPversion",
+       "supportedACIMechanisms",
        "subschemaSubentry",            /* NO USER MOD */
        NULL
 
@@ -310,11 +311,13 @@ oc_check_allowed( char *type, struct berval **ocl )
                        }
                        /* maybe the next oc allows it */
 
+#ifdef OC_UNDEFINED_IMPLES_EXTENSIBLE
                /* we don't know about the oc. assume it allows it */
                } else {
                        if ( t != type )
                                ldap_memfree( t );
                        return( 0 );
+#endif
                }
        }