From efad6a64030a7586a65e57697305141eddf63f81 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 6 Aug 2013 16:51:02 -0400 Subject: Renames and fix a memory leak Rename backend_staged_data to backend_staged_search. Fix some formatting. Change how we walk the list of entries retrieved using a staged search so that if the map's been removed since the search was staged, we still free the temporary entry structures. --- src/back-sch.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/back-sch.h') diff --git a/src/back-sch.h b/src/back-sch.h index 3b91c66..7887127 100644 --- a/src/back-sch.h +++ b/src/back-sch.h @@ -45,10 +45,10 @@ struct backend_entry_data { Slapi_Entry *e; }; -struct backend_staged_data { - struct backend_staged_data *next; - struct backend_set_data *set_data_fixup; +struct backend_staged_search { + struct backend_staged_search *next; char *map_group, *map_set; + struct backend_set_data *set_data; enum sch_search_nsswitch_t type; bool_t is_id; bool_t search_members; @@ -79,14 +79,14 @@ struct backend_search_cbdata { bool_t matched; char *closest_match, *text; int n_entries; - struct backend_staged_data *staged; - struct backend_staged_data *cur_staged; + struct backend_staged_search *staged; + struct backend_staged_search *cur_staged; }; void backend_search_nsswitch(struct backend_set_data *set_data, struct backend_search_cbdata *cbdata); -bool_t backend_retrieve_from_nsswitch(struct backend_staged_data *staged, +bool_t backend_retrieve_from_nsswitch(struct backend_staged_search *staged, struct backend_search_cbdata *cbdata); int backend_sch_do_pam_auth(Slapi_PBlock *pb, const char *username); -- cgit