X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=f99fb5d37dfd62624de89eaeaa1cb9b0da8453dd;hb=3d522a0c9fd79b0275a219bde1f4465b181a9318;hp=c5cb507770e5c2f3ca32d40892b62babd255ccae;hpb=216bcd948e22e66361a6c656407750773b70fd4f;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index c5cb507770..f99fb5d37d 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,8 +1,17 @@
 /* schema.c - routines to manage schema definitions */
 /* $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"
@@ -32,9 +41,7 @@ schema_info( Entry **entry, const char **text )
 
 	Entry		*e;
 	struct berval	vals[5];
-#ifdef SLAP_NVALUES
 	struct berval	nvals[5];
-#endif
 
 	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
 	if( e == NULL ) {
@@ -60,11 +67,7 @@ schema_info( Entry **entry, const char **text )
 
 	vals[0].bv_val = "subentry";
 	vals[0].bv_len = sizeof("subentry")-1;
-#ifdef SLAP_NVALUES
 	if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) )
-#else
-	if( attr_merge_one( e, ad_structuralObjectClass, vals ) )
-#endif
 	{
 		/* Out of memory, do something about it */
 		entry_free( e );
@@ -81,11 +84,7 @@ schema_info( Entry **entry, const char **text )
 	vals[3].bv_val = "extensibleObject";
 	vals[3].bv_len = sizeof("extensibleObject")-1;
 	vals[4].bv_val = NULL;
-#ifdef SLAP_NVALUES
 	if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
-	if( attr_merge( e, ad_objectClass, vals ) )
-#endif
 	{
 		/* Out of memory, do something about it */
 		entry_free( e );
@@ -116,7 +115,6 @@ schema_info( Entry **entry, const char **text )
 			return LDAP_OTHER;
 		}
 
-#ifdef SLAP_NVALUES
 		nvals[0].bv_val = strchr( global_schemandn.bv_val, '=' );
 		assert( nvals[0].bv_val );
 		nvals[0].bv_val++;
@@ -124,9 +122,6 @@ schema_info( Entry **entry, const char **text )
 			(nvals[0].bv_val - global_schemandn.bv_val);
 
 		if( attr_merge_one( e, desc, vals, nvals ) )
-#else
-		if( attr_merge_one( e, desc, vals ) )
-#endif
 		{
 			/* Out of memory, do something about it */
 			entry_free( e );
@@ -158,22 +153,14 @@ schema_info( Entry **entry, const char **text )
 		vals[0].bv_val = timebuf;
 		vals[0].bv_len = strlen( timebuf );
 
-#ifdef SLAP_NVALUES
 		if( attr_merge_one( e, ad_createTimestamp, vals, vals ) )
-#else
-		if( attr_merge_one( e, ad_createTimestamp, vals ) )
-#endif
 		{
 			/* Out of memory, do something about it */
 			entry_free( e );
 			*text = "out of memory";
 			return LDAP_OTHER;
 		}
-#ifdef SLAP_NVALUES
 		if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) )
-#else
-		if( attr_merge_one( e, ad_modifyTimestamp, vals ) )
-#endif
 		{
 			/* Out of memory, do something about it */
 			entry_free( e );