X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=b31defeaef19610d784a8d705591721c062bae33;hb=ee66a01b8c7dc0c1bd7838c0f6137fad03595ad1;hp=30c542a58241a6a563ad6ee301b65c85a1886321;hpb=c75be97ae946dab41f002a31d8347cc38cda7658;p=openldap

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 30c542a582..b31defeaef 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,8 +1,17 @@
 /* oc.c - object class routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -24,15 +33,9 @@ int is_object_subclass(
 
 	if( sub == NULL || sup == NULL ) return 0;
 
-#if 1
-#ifdef NEW_LOGGING
-	LDAP_LOG ( OPERATION, ARGS, 
-		"is_object_subclass(%s,%s) %d\n",
-		sup->soc_oid, sub->soc_oid, sup == sub );
-#else
+#if 0
 	Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
 		sup->soc_oid, sub->soc_oid, sup == sub );
-#endif
 #endif
 
 	if( sup == sub ) {
@@ -84,17 +87,10 @@ int is_entry_objectclass(
 	attr = attr_find(e->e_attrs, objectClass);
 	if( attr == NULL ) {
 		/* no objectClass attribute */
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"is_entry_objectclass: dn(%s), oid (%s), no objectClass "
-			"attribute.\n", e->e_dn == NULL ? "" : e->e_dn,
-			oc->soc_oclass.oc_oid, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
 			"no objectClass attribute\n",
 			e->e_dn == NULL ? "" : e->e_dn,
 			oc->soc_oclass.oc_oid, 0 );
-#endif
 
 		return 0;
 	}
@@ -134,8 +130,7 @@ oc_index_cmp(
 {
 	const struct oindexrec *oir1 = v_oir1, *oir2 = v_oir2;
 	int i = oir1->oir_name.bv_len - oir2->oir_name.bv_len;
-	if (i)
-		return i;
+	if (i) return i;
 	return strcasecmp( oir1->oir_name.bv_val, oir2->oir_name.bv_val );
 }
 
@@ -147,8 +142,7 @@ oc_index_name_cmp(
 	const struct berval    *name = v_name;
 	const struct oindexrec *oir  = v_oir;
 	int i = name->bv_len - oir->oir_name.bv_len;
-	if (i)
-		return i;
+	if (i) return i;
 	return strncasecmp( name->bv_val, oir->oir_name.bv_val, name->bv_len );
 }
 
@@ -349,8 +343,7 @@ oc_destroy( void )
 static int
 oc_insert(
     ObjectClass		*soc,
-    const char		**err
-)
+    const char		**err )
 {
 	struct oindexrec	*oir;
 	char			**names;
@@ -369,7 +362,7 @@ oc_insert(
 		assert( oir->oir_oc );
 
 		if ( avl_insert( &oc_index, (caddr_t) oir,
-		                 oc_index_cmp, avl_dup_error ) )
+			oc_index_cmp, avl_dup_error ) )
 		{
 			*err = soc->soc_oid;
 			ldap_memfree(oir);
@@ -392,7 +385,7 @@ oc_insert(
 			assert( oir->oir_oc );
 
 			if ( avl_insert( &oc_index, (caddr_t) oir,
-			                 oc_index_cmp, avl_dup_error ) )
+				oc_index_cmp, avl_dup_error ) )
 			{
 				*err = *names;
 				ldap_memfree(oir);
@@ -413,8 +406,7 @@ int
 oc_add(
     LDAPObjectClass	*oc,
 	int user,
-    const char		**err
-)
+    const char		**err )
 {
 	ObjectClass	*soc;
 	int		code;
@@ -464,6 +456,7 @@ oc_add(
 	}
 
 	if ( code != 0 ) return code;
+	if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
 
 	code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
 	if ( code != 0 ) return code;
@@ -471,7 +464,7 @@ oc_add(
 	code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
 	if ( code != 0 ) return code;
 
-	if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+	if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
 
 	code = oc_insert(soc,err);
 	return code;
@@ -492,15 +485,14 @@ oc_schema_info( Entry *e )
 			return -1;
 		}
 
+		nval = oc->soc_cname;
+
 #if 0
-		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
-	       (long) val.bv_len, val.bv_val, 0 );
+		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s (%s)\n",
+	       (long) val.bv_len, val.bv_val, nval.bv_val );
 #endif
-		nval.bv_val = oc->soc_oid;
-		nval.bv_len = strlen(oc->soc_oid);
 
-		if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
-		{
+		if( attr_merge_one( e, ad_objectClasses, &val, &nval ) ) {
 			return -1;
 		}
 		ldap_memfree( val.bv_val );