Notices and acknowledgements

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 578590e2cf3544ceac3482173612421a0d6b32b7..623c5399e8c39dd06fa6d8dbc8efc5daadaf9e2e 100644 (file)
--- 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-2003 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"
@@ -483,9 +492,7 @@ oc_schema_info( Entry *e )
        AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
        ObjectClass     *oc;
        struct berval   val;
-#ifdef SLAP_NVALUES
        struct berval   nval;
-#endif
 
        LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
                if( oc->soc_flags & SLAP_OC_HIDE ) continue;
@@ -498,14 +505,10 @@ oc_schema_info( Entry *e )
                Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
               (long) val.bv_len, val.bv_val, 0 );
 #endif
-#ifdef SLAP_NVALUES
                nval.bv_val = oc->soc_oid;
                nval.bv_len = strlen(oc->soc_oid);
 
                if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
-#else
-               if( attr_merge_one( e, ad_objectClasses, &val ) )
-#endif
                {
                        return -1;
                }