diff options
author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-07 19:29:21 -0400 |
---|---|---|
committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-07 19:29:21 -0400 |
commit | 53299822cdec2ff1da21344148196789bbdd0728 (patch) | |
tree | a1f47ae30450a1514f90bcfc714d701a5ff36907 /src/back-nis.c | |
parent | 6e31d77f8e899643887db88831917c2076afa8b9 (diff) | |
download | slapi-nis-53299822cdec2ff1da21344148196789bbdd0728.tar.gz slapi-nis-53299822cdec2ff1da21344148196789bbdd0728.tar.xz slapi-nis-53299822cdec2ff1da21344148196789bbdd0728.zip |
- correctly handle the case where the tcpwrappers daemon name isn't configured
Diffstat (limited to 'src/back-nis.c')
-rw-r--r-- | src/back-nis.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/back-nis.c b/src/back-nis.c index 661145f..81d3611 100644 --- a/src/back-nis.c +++ b/src/back-nis.c @@ -85,7 +85,7 @@ backend_free_set_data_contents(void *data) if (set_data != NULL) { free(set_data->common.group); free(set_data->common.set); - free(set_data->common.bases); + backend_shr_free_strlist(set_data->common.bases); format_free_attr_list(set_data->common.ref_attrs); format_free_inref_attrs(set_data->common.inref_attrs); free(set_data->common.entry_filter); @@ -597,8 +597,23 @@ backend_update_params(struct plugin_state *state) #ifdef HAVE_TCPD_H tmp = backend_shr_get_vattr_str(state, our_entry, NIS_PLUGIN_CONFIGURATION_TCPWRAPNAME_ATTR); - request_set(state->request_info, RQ_DAEMON, tmp); - free(tmp); + if (tmp != NULL) { + slapi_log_error(SLAPI_LOG_PLUGIN, + state->plugin_desc->spd_id, + "setting tcp_wrappers context at %p's " + "name to \"%s\"\n", + state->request_info, tmp); + request_set(state->request_info, RQ_DAEMON, tmp); + free(tmp); + } else { + slapi_log_error(SLAPI_LOG_PLUGIN, + state->plugin_desc->spd_id, + "(re)setting tcp_wrappers context at %p's " + "name to \"%s\"\n", + state->request_info, DEFAULT_TCPWRAP_NAME); + request_set(state->request_info, RQ_DAEMON, + DEFAULT_TCPWRAP_NAME); + } #endif slapi_entry_free(our_entry); } |