ITS#1716 is_entry_subentr/ies/y/

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 72f68e195ad6341827836e4b9b38daa19c1943b2..4be9256d060c095c762d678141cba82b4c777aef 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,7 +1,7 @@
 /* schema.c - routines to manage schema definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -39,16 +39,16 @@ schema_info( Entry **entry, const char **text )
        (void) dnNormalize2( NULL, &e->e_name, &e->e_nname );
        e->e_private = NULL;
 
-       vals[0].bv_val = "LDAPsubentry";
-       vals[0].bv_len = sizeof("LDAPsubentry")-1;
+       vals[0].bv_val = "subentry";
+       vals[0].bv_len = sizeof("subentry")-1;
        attr_merge( e, ad_structuralObjectClass, vals );
 
        vals[0].bv_val = "top";
        vals[0].bv_len = sizeof("top")-1;
        attr_merge( e, ad_objectClass, vals );
 
-       vals[0].bv_val = "LDAPsubentry";
-       vals[0].bv_len = sizeof("LDAPsubentry")-1;
+       vals[0].bv_val = "subentry";
+       vals[0].bv_len = sizeof("subentry")-1;
        attr_merge( e, ad_objectClass, vals );
 
        vals[0].bv_val = "subschema";
@@ -88,6 +88,7 @@ schema_info( Entry **entry, const char **text )
 
        if ( syn_schema_info( e ) 
                || mr_schema_info( e )
+               || mru_schema_info( e )
                || at_schema_info( e )
                || oc_schema_info( e ) )
        {