Commit 35e3f2ec authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6054

parent 29e09616
OpenLDAP 2.4 Change Log
OpenLDAP 2.4.17 Engineering
Fixed slapd normalization of updated schema attributes (ITS#5540)
Fixed slapd errno handling (ITS#6037)
Fixed slapd global alloc handling (ITS#6054)
Fixed slapd moduleload with static backends and modules (ITS#6016)
Fixed slapd normalization of updated schema attributes (ITS#5540)
Build Environment
Added test056-monitor (ITS#5540)
Added test057-memberof-refint (ITS#5395)
......
......@@ -267,11 +267,19 @@ slap_sl_malloc(
int i, j;
#ifdef SLAP_NO_SL_MALLOC
return ber_memalloc_x( size, NULL );
newptr = ber_memalloc_x( size, NULL );
if ( newptr ) return newptr;
assert( 0 );
exit( EXIT_FAILURE );
#endif
/* ber_set_option calls us like this */
if (!ctx) return ber_memalloc_x(size, NULL);
if (!ctx) {
newptr = ber_memalloc_x( size, NULL );
if ( newptr ) return newptr;
assert( 0 );
exit( EXIT_FAILURE );
}
/* round up to doubleword boundary */
size += sizeof(ber_len_t) + pad;
......@@ -375,7 +383,10 @@ slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
return slap_sl_malloc(size, ctx);
#ifdef SLAP_NO_SL_MALLOC
return ber_memrealloc_x( ptr, size, NULL );
newptr = ber_memrealloc_x( ptr, size, NULL );
if ( newptr ) return newptr;
assert( 0 );
exit( EXIT_FAILURE );
#endif
/* Not our memory? */
......
......@@ -1302,10 +1302,6 @@ do_syncrepl(
connection_fake_init( &conn, &opbuf, ctx );
op = &opbuf.ob_op;
/* use global malloc for now */
op->o_tmpmemctx = NULL;
op->o_tmpmfuncs = &ch_mfuncs;
op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
be = si->si_be;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment