diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-07 14:56:44 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-07 14:56:44 -0400 |
| commit | 6e0674934fbb8fa5c4f1af1a45e311420927c5b9 (patch) | |
| tree | 0d877eee30baee1530c12d3d7a47015a35b82c00 /src/back-nis.c | |
| parent | ead7d4eb5223ebabe1e8c5d00f77788b586f543d (diff) | |
| download | slapi-nis-6e0674934fbb8fa5c4f1af1a45e311420927c5b9.tar.gz slapi-nis-6e0674934fbb8fa5c4f1af1a45e311420927c5b9.tar.xz slapi-nis-6e0674934fbb8fa5c4f1af1a45e311420927c5b9.zip | |
- fill in the default filter if we fail to find an explicitly-configured one,
rather than overwriting the default with NULL if we fail to find one
Diffstat (limited to 'src/back-nis.c')
| -rw-r--r-- | src/back-nis.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/back-nis.c b/src/back-nis.c index a645bba..661145f 100644 --- a/src/back-nis.c +++ b/src/back-nis.c @@ -693,15 +693,18 @@ backend_get_set_config(struct plugin_state *state, state->plugin_identity, 0); cbdata.bases = NULL; + cbdata.entry_filter = NULL; cbdata.state = state; map_secure = FALSE; - defaults_get_map_config(map, &map_secure, &default_filter, - NULL, NULL, NULL, NULL); - cbdata.entry_filter = strdup(default_filter); slapi_search_internal_callback_pb(pb, &cbdata, NULL, backend_get_set_config_entry_cb, NULL); + defaults_get_map_config(map, &map_secure, &default_filter, + NULL, NULL, NULL, NULL); + if (cbdata.entry_filter == NULL) { + cbdata.entry_filter = strdup(default_filter); + } /* Return the results. */ *bases = cbdata.bases; |