#include <ac/socket.h>
#include "slap.h"
-#include "ldap_pvt.h"
#include "lutil.h"
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;
}
ber_dupbv( &e->e_nname, &frontendDB->be_schemandn );
e->e_private = NULL;
- vals[0].bv_val = "subentry";
- vals[0].bv_len = sizeof("subentry")-1;
- if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) ) {
+ BER_BVSTR( &vals[0], "subentry" );
+ if( attr_merge_one( e, ad_structuralObjectClass, vals, NULL ) ) {
/* 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[1].bv_val = "subentry";
- vals[1].bv_len = sizeof("subentry")-1;
- vals[2].bv_val = "subschema";
- vals[2].bv_len = sizeof("subschema")-1;
- vals[3].bv_val = "extensibleObject";
- vals[3].bv_len = sizeof("extensibleObject")-1;
- vals[4].bv_val = NULL;
- if( attr_merge( e, ad_objectClass, vals, vals ) ) {
+ BER_BVSTR( &vals[0], "top" );
+ BER_BVSTR( &vals[1], "subentry" );
+ BER_BVSTR( &vals[2], "subschema" );
+ BER_BVSTR( &vals[3], "extensibleObject" );
+ BER_BVZERO( &vals[4] );
+ if ( attr_merge( e, ad_objectClass, vals, NULL ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
nvals[0].bv_len = frontendDB->be_schemandn.bv_len -
(nvals[0].bv_val - frontendDB->be_schemandn.bv_val);
- if( attr_merge_one( e, desc, vals, nvals ) ) {
+ if ( attr_merge_one( e, desc, vals, nvals ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
vals[0].bv_val = timebuf;
vals[0].bv_len = strlen( timebuf );
- if( attr_merge_one( e, ad_createTimestamp, vals, vals ) ) {
+ if( attr_merge_one( e, ad_createTimestamp, vals, NULL ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
return LDAP_OTHER;
}
- if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) ) {
+ if( attr_merge_one( e, ad_modifyTimestamp, vals, NULL ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";