diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-23 11:41:01 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-23 11:41:01 -0500 |
| commit | 0081e1f61eb518dde1fd9e681f5cf63faba19afb (patch) | |
| tree | 1adf9fda243db7f037d1671dbd6dff1e9838d195 /src/back-shr.c | |
| parent | 8df6da36bde942c90495d6f83cf79694bdf73f94 (diff) | |
| download | slapi-nis-0081e1f61eb518dde1fd9e681f5cf63faba19afb.tar.gz slapi-nis-0081e1f61eb518dde1fd9e681f5cf63faba19afb.tar.xz slapi-nis-0081e1f61eb518dde1fd9e681f5cf63faba19afb.zip | |
- avoid a possible NULL deref
Diffstat (limited to 'src/back-shr.c')
| -rw-r--r-- | src/back-shr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/back-shr.c b/src/back-shr.c index c553b12..913e190 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -945,7 +945,7 @@ backend_shr_update_references_cb(const char *group, const char *set, set_data->group, set_data->set, slapi_entry_get_ndn(cbdata->e), - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); return TRUE; } else { @@ -957,7 +957,7 @@ backend_shr_update_references_cb(const char *group, const char *set, set_data->group, set_data->set, slapi_entry_get_ndn(cbdata->e), - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } } else { @@ -965,11 +965,11 @@ backend_shr_update_references_cb(const char *group, const char *set, state->plugin_desc->spd_id, "reference-based changes for " "\"%s\"/\"%s\" made in (\"%s\") " - "(%s in %s)\n", + "(%s in %s or empty)\n", set_data->group, set_data->set, slapi_entry_get_ndn(cbdata->e), - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } @@ -1700,7 +1700,7 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag, set_data->group, set_data->set, cbdata->ndn, - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); return TRUE; } else { @@ -1712,7 +1712,7 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag, set_data->group, set_data->set, cbdata->ndn, - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } } else { @@ -1720,11 +1720,11 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag, cbdata->state->plugin_desc->spd_id, "changes for " "\"%s\"/\"%s\" made in (\"%s\") " - "(%s in %s)\n", + "(%s in %s or empty)\n", set_data->group, set_data->set, cbdata->ndn, - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } /* If the entry used to match the map, remove it. */ |