/* schema.c - routines to manage schema definitions */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Entry *e;
struct berval vals[5];
+#ifdef SLAP_NVALUES
+ struct berval nvals[5];
+#endif
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+ e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+ if( e == NULL ) {
+ /* Out of memory, do something about it */
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0,0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0, 0 );
+#endif
+ *text = "out of memory";
+ return LDAP_OTHER;
+ }
e->e_attrs = NULL;
/* backend-specific schema info should be created by the
vals[0].bv_val = "subentry";
vals[0].bv_len = sizeof("subentry")-1;
- attr_merge_one( e, ad_structuralObjectClass, vals );
+#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 );
+ *text = "out of memory";
+ return LDAP_OTHER;
+ }
vals[0].bv_val = "top";
vals[0].bv_len = sizeof("top")-1;
vals[3].bv_val = "extensibleObject";
vals[3].bv_len = sizeof("extensibleObject")-1;
vals[4].bv_val = NULL;
- attr_merge( e, ad_objectClass, vals );
+#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 );
+ *text = "out of memory";
+ return LDAP_OTHER;
+ }
{
int rc;
return LDAP_OTHER;
}
- attr_merge_one( e, desc, vals );
+#ifdef SLAP_NVALUES
+ nvals[0].bv_val = strchr( global_schemandn.bv_val, '=' );
+ assert( nvals[0].bv_val );
+ nvals[0].bv_val++;
+ nvals[0].bv_len = global_schemandn.bv_len -
+ (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 );
+ *text = "out of memory";
+ return LDAP_OTHER;
+ }
}
{
vals[0].bv_val = timebuf;
vals[0].bv_len = strlen( timebuf );
- attr_merge_one( e, ad_createTimestamp, vals );
- attr_merge_one( e, ad_modifyTimestamp, vals );
+#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 );
+ *text = "out of memory";
+ return LDAP_OTHER;
+ }
}
if ( syn_schema_info( e )