From a4547135db29233dedc4b6bf429d3cfe89182e75 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 16 Jan 2012 14:17:28 -0500 Subject: - in callbacks, only use pblocks that are built from pblocks that we already have, so that we can pass the transaction ID around; this includes additional parameters for a number of functions and a new callback data type for backend_set_config_entry_add_cb() --- src/map.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/map.c') diff --git a/src/map.c b/src/map.c index f91a36a..84957de 100644 --- a/src/map.c +++ b/src/map.c @@ -293,7 +293,7 @@ bool_t map_data_foreach_entry_id(struct plugin_state *state, const char *domain, const char *map, const char *id, bool_t (*fn)(const char *domain, const char *map, - bool_t secure, + bool_t secure, const char *key, unsigned int key_len, const char *value, @@ -389,7 +389,10 @@ int map_master_name(struct plugin_state *state, const char **master) { char *tmp, hostname[HOST_NAME_MAX + 1]; - if (backend_read_master_name(state, &tmp) == 0) { + Slapi_PBlock *pb; + + pb = slapi_pblock_new(); + if (backend_read_master_name(state, pb, &tmp) == 0) { free(map_data.master); map_data.master = strdup(tmp); backend_free_master_name(state, tmp); @@ -402,6 +405,7 @@ map_master_name(struct plugin_state *state, const char **master) map_data.master = strdup(hostname); } *master = map_data.master; + slapi_pblock_destroy(pb); return 0; } @@ -640,7 +644,7 @@ map_data_check_entry(struct plugin_state *state, { return (map_data_find_map_entry_id(state, map_data_find_map(state, - domain_name, + domain_name, map_name), id) != NULL); } -- cgit