mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

plug leaks

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-05 11:07:06 +00:00
parent 9586fed42f
commit 3974bb0e44
1 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
servers/slapd/overlays/translucent.c
View File

@ -63,20 +63,20 @@ static struct berval glue[] = { BER_BVC("top"), BER_BVC("glue"), BER_BVNULL };
void glue_parent(Operation *op) { void glue_parent(Operation *op) {
Operation nop = *op; Operation nop = *op;
slap_overinst *on = (slap_overinst *) op->o_bd->bd_info; slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
struct berval dn = { 0, NULL }; struct berval ndn = BER_BVNULL;
Attribute *a; Attribute *a;
Entry *e; Entry *e;
struct berval pdn; struct berval pdn;
dnParent( &op->o_req_ndn, &pdn ); dnParent( &op->o_req_ndn, &pdn );
ber_dupbv( &dn, &pdn ); ber_dupbv_x( &ndn, &pdn, op->o_tmpmemctx );
Debug(LDAP_DEBUG_TRACE, "=> glue_parent: fabricating glue for <%s>\n", dn.bv_val, 0, 0); Debug(LDAP_DEBUG_TRACE, "=> glue_parent: fabricating glue for <%s>\n", ndn.bv_val, 0, 0);
e = ch_calloc(1, sizeof(Entry)); e = ch_calloc(1, sizeof(Entry));
e->e_id = NOID; e->e_id = NOID;
ber_dupbv(&e->e_name, &dn); ber_dupbv(&e->e_name, &ndn);
ber_dupbv(&e->e_nname, &dn); ber_dupbv(&e->e_nname, &ndn);
a = ch_calloc(1, sizeof(Attribute)); a = ch_calloc(1, sizeof(Attribute));
a->a_desc = slap_schema.si_ad_objectClass; a->a_desc = slap_schema.si_ad_objectClass;
@ -97,12 +97,15 @@ void glue_parent(Operation *op) {
a->a_next = e->e_attrs; a->a_next = e->e_attrs;
e->e_attrs = a; e->e_attrs = a;
nop.o_req_dn = dn; nop.o_req_dn = ndn;
nop.o_req_ndn = dn; nop.o_req_ndn = ndn;
nop.ora_e = e; nop.ora_e = e;
nop.o_bd->bd_info = (BackendInfo *) on->on_info->oi_orig; nop.o_bd->bd_info = (BackendInfo *) on->on_info->oi_orig;
syncrepl_add_glue(&nop, e); syncrepl_add_glue(&nop, e);
op->o_tmpfree( ndn.bv_val, op->o_tmpmemctx );
return; return;
} }
@ -129,9 +132,9 @@ BerVarray dup_bervarray(BerVarray b) {
*/ */
void free_attr_chain(Attribute *a) { void free_attr_chain(Attribute *a) {
Attribute *ax; Attribute *ax;
for(ax = NULL; a; a = a->a_next) { for(; a; a = ax) {
if(ax) ch_free(ax); ax = a->a_next;
ax = a; ch_free(a);
} }
return; return;
} }
@ -226,11 +229,11 @@ static int translucent_modify(Operation *op, SlapReply *rs) {
slap_overinst *on = (slap_overinst *) op->o_bd->bd_info; slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
overlay_stack *ov = on->on_bi.bi_private; overlay_stack *ov = on->on_bi.bi_private;
void *private = op->o_bd->be_private; void *private = op->o_bd->be_private;
Entry ne, *e, *re = NULL; Entry ne, *e = NULL, *re = NULL;
Attribute *a, *ax; Attribute *a, *ax;
Modifications *m, *mm; Modifications *m, *mm;
int del, rc, erc = 0; int del, rc, erc = 0;
slap_callback cb = { 0 }, *save_cb; slap_callback cb = { 0 };
Debug(LDAP_DEBUG_TRACE, "==> translucent_modify: %s\n", Debug(LDAP_DEBUG_TRACE, "==> translucent_modify: %s\n",
op->o_req_dn.bv_val, 0, 0); op->o_req_dn.bv_val, 0, 0);
@ -248,7 +251,7 @@ static int translucent_modify(Operation *op, SlapReply *rs) {
op->o_bd->be_private = private; op->o_bd->be_private = private;
/* if(ov->config->no_add && (!re || rc != LDAP_SUCCESS)) */ /* if(ov->config->no_add && (!re || rc != LDAP_SUCCESS)) */
if(!re || rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS || re == NULL ) {
send_ldap_error(op, rs, LDAP_NO_SUCH_OBJECT, send_ldap_error(op, rs, LDAP_NO_SUCH_OBJECT,
"attempt to modify nonexistent local record"); "attempt to modify nonexistent local record");
return(rs->sr_err); return(rs->sr_err);
@ -321,6 +324,15 @@ release:
} }
} }
/* don't leak remote entry copy */
if(re) {
op->o_bd->be_private = ov->private;
if(ov->info->bi_entry_release_rw)
ov->info->bi_entry_release_rw(op, re, 0);
else
entry_free(re);
op->o_bd->be_private = private;
}
/* /*
** foreach Modification: ** foreach Modification:
** if MOD_ADD or MOD_REPLACE, add Attribute; ** if MOD_ADD or MOD_REPLACE, add Attribute;
@ -387,13 +399,11 @@ release:
op->o_bd->bd_info = (BackendInfo *) on; op->o_bd->bd_info = (BackendInfo *) on;
glue_parent(&nop); glue_parent(&nop);
save_cb = op->o_callback;
cb.sc_response = translucent_tag_cb; cb.sc_response = translucent_tag_cb;
cb.sc_private = (void *)LDAP_REQ_MODIFY; cb.sc_private = (void *)LDAP_REQ_MODIFY;
cb.sc_next = nop.o_callback; cb.sc_next = nop.o_callback;
nop.o_callback = &cb; nop.o_callback = &cb;
rc = on->on_info->oi_orig->bi_op_add(&nop, &nrs); rc = on->on_info->oi_orig->bi_op_add(&nop, &nrs);
nop.o_callback = save_cb;
free_attr_chain(a); free_attr_chain(a);
return(rc); return(rc);
@ -574,13 +584,13 @@ static int translucent_bind(Operation *op, SlapReply *rs) {
} }
/* /*
** translucent_config() ** translucent_db_config()
** pass config directives to captive backend; ** pass config directives to captive backend;
** parse unrecognized directives ourselves; ** parse unrecognized directives ourselves;
** **
*/ */
static int translucent_config( static int translucent_db_config(
BackendDB *be, BackendDB *be,
const char *fname, const char *fname,
int lineno, int lineno,
@ -679,12 +689,12 @@ static int translucent_db_init(BackendDB *be) {
} }
/* /*
** translucent_open() ** translucent_db_open()
** if the captive backend has an open() method, call it; ** if the captive backend has an open() method, call it;
** **
*/ */
static int translucent_open(BackendDB *be) { static int translucent_db_open(BackendDB *be) {
slap_overinst *on = (slap_overinst *) be->bd_info; slap_overinst *on = (slap_overinst *) be->bd_info;
overlay_stack *ov = on->on_bi.bi_private; overlay_stack *ov = on->on_bi.bi_private;
void *private = be->be_private; void *private = be->be_private;
@ -709,28 +719,56 @@ static int translucent_open(BackendDB *be) {
} }
/* /*
** translucent_close() ** translucent_db_close()
** if the captive backend has a close() method, call it; ** if the captive backend has a close() method, call it;
** free any config data; ** free any config data;
** **
*/ */
static int translucent_close(BackendDB *be) { static int translucent_db_close(BackendDB *be) {
slap_overinst *on = (slap_overinst *) be->bd_info; slap_overinst *on = (slap_overinst *) be->bd_info;
overlay_stack *ov = on->on_bi.bi_private; overlay_stack *ov = on->on_bi.bi_private;
void *private = be->be_private; int rc = 0;
int rc;
if ( ov ) {
void *private = be->be_private;
be->be_private = ov->private;
rc = (ov->info && ov->info->bi_db_close) ? ov->info->bi_db_close(be) : 0;
be->be_private = private;
if(ov->config) ch_free(ov->config);
ov->config = NULL;
}
be->be_private = ov->private;
rc = (ov->info && ov->info->bi_db_close) ? ov->info->bi_db_close(be) : 0;
be->be_private = private;
if(ov->config) ch_free(ov->config);
ch_free(ov);
return(rc); return(rc);
} }
/* /*
** translucent_init() ** translucent_db_destroy()
** if the captive backend has a db_destroy() method, call it
**
*/
static int translucent_db_destroy(BackendDB *be) {
slap_overinst *on = (slap_overinst *) be->bd_info;
overlay_stack *ov = on->on_bi.bi_private;
int rc = 0;
if ( ov ) {
void *private = be->be_private;
be->be_private = ov->private;
rc = (ov->info && ov->info->bi_db_destroy) ? ov->info->bi_db_destroy(be) : 0;
be->be_private = private;
ch_free(ov);
on->on_bi.bi_private = NULL;
}
return(rc);
}
/*
** translucent_initialize()
** initialize the slap_overinst with our entry points; ** initialize the slap_overinst with our entry points;
** **
*/ */
@ -739,9 +777,10 @@ int translucent_initialize() {
translucent.on_bi.bi_type = "translucent"; translucent.on_bi.bi_type = "translucent";
translucent.on_bi.bi_db_init = translucent_db_init; translucent.on_bi.bi_db_init = translucent_db_init;
translucent.on_bi.bi_db_config = translucent_config; translucent.on_bi.bi_db_config = translucent_db_config;
translucent.on_bi.bi_db_open = translucent_open; translucent.on_bi.bi_db_open = translucent_db_open;
translucent.on_bi.bi_db_close = translucent_close; translucent.on_bi.bi_db_close = translucent_db_close;
translucent.on_bi.bi_db_destroy = translucent_db_destroy;
translucent.on_bi.bi_op_bind = translucent_bind; translucent.on_bi.bi_op_bind = translucent_bind;
translucent.on_bi.bi_op_add = translucent_add; translucent.on_bi.bi_op_add = translucent_add;
translucent.on_bi.bi_op_modify = translucent_modify; translucent.on_bi.bi_op_modify = translucent_modify;