diff options
| -rw-r--r-- | src/back-nis.c | 12 | ||||
| -rw-r--r-- | src/back-sch.c | 22 | ||||
| -rw-r--r-- | src/back-shr.c | 6 | ||||
| -rw-r--r-- | src/format.c | 8 | ||||
| -rw-r--r-- | src/nis.c | 6 |
5 files changed, 24 insertions, 30 deletions
diff --git a/src/back-nis.c b/src/back-nis.c index 0d8fa8e..cd7a59a 100644 --- a/src/back-nis.c +++ b/src/back-nis.c @@ -719,7 +719,7 @@ int backend_set_config_entry_add_cb(Slapi_Entry *e, void *callback_data) { char **domains, **maps; - int i, j, ret; + int i, j; struct backend_set_config_entry_add_cbdata *cbdata; cbdata = callback_data; @@ -729,11 +729,11 @@ backend_set_config_entry_add_cb(Slapi_Entry *e, void *callback_data) NIS_MAP_CONFIGURATION_MAP_ATTR); for (i = 0; (domains != NULL) && (domains[i] != NULL); i++) { for (j = 0; (maps != NULL) && (maps[j] != NULL); j++) { - ret = backend_shr_set_config_entry_add(cbdata->state, - cbdata->pb, - e, - domains[i], - maps[j]); + backend_shr_set_config_entry_add(cbdata->state, + cbdata->pb, + e, + domains[i], + maps[j]); } } backend_shr_free_strlist(maps); diff --git a/src/back-sch.c b/src/back-sch.c index 47e2294..5f2e72d 100644 --- a/src/back-sch.c +++ b/src/back-sch.c @@ -476,7 +476,7 @@ int backend_set_config_entry_add_cb(Slapi_Entry *e, void *callback_data) { char **groups, **containers; - int i, j, ret; + int i, j; struct backend_set_config_entry_add_cbdata *cbdata; cbdata = callback_data; @@ -489,19 +489,19 @@ backend_set_config_entry_add_cb(Slapi_Entry *e, void *callback_data) for (j = 0; (containers != NULL) && (containers[j] != NULL); j++) { - ret = backend_shr_set_config_entry_add(cbdata->state, - cbdata->pb, - e, - groups[i], - containers[j]); + backend_shr_set_config_entry_add(cbdata->state, + cbdata->pb, + e, + groups[i], + containers[j]); } /* If there are no containers, add one with an empty name. */ if (containers == NULL) { - ret = backend_shr_set_config_entry_add(cbdata->state, - cbdata->pb, - e, - groups[i], - ""); + backend_shr_set_config_entry_add(cbdata->state, + cbdata->pb, + e, + groups[i], + ""); } } backend_shr_free_strlist(containers); diff --git a/src/back-shr.c b/src/back-shr.c index 33012e1..cb0cdb3 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -1770,11 +1770,11 @@ backend_shr_filter_mods(LDAPMod **mods, Slapi_Entry *pre, Slapi_Entry *post, { LDAPMod *mod; Slapi_ValueSet *values; - Slapi_Value *value, *mval; - const struct berval *mbv, *ebv; + Slapi_Value *mval; + const struct berval *mbv; struct berval msv; char *actual_attr; - int i, j, k, result, disposition, buffer_flags; + int i, j, result, disposition, buffer_flags; if (mods == NULL) { return; diff --git a/src/format.c b/src/format.c index 70d0f19..2d18da7 100644 --- a/src/format.c +++ b/src/format.c @@ -1214,7 +1214,7 @@ format_deref_rx(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, struct format_ref_attr_list ***ref_attr_list, struct format_ref_attr_list ***inref_attr_list) { - int i, j, k, argc; + int i, j, k; Slapi_Entry *entry; Slapi_DN **these, **these2, **next, **next2, *parent; Slapi_ValueSet *values; @@ -3132,10 +3132,8 @@ format_internal_sequence_number(struct plugin_state *state, { static int sequence; char *buf; - int ret, i, j, argc; - char **argv, **values; - const char *value_format, *default_value; - unsigned int *lengths; + int ret; + const char *value_format; struct berval **choices, bv; choices = NULL; @@ -892,7 +892,7 @@ nis_process_request(struct plugin_state *state, AUTH *request_auth, *reply_auth; char auth_buf[MAX_AUTH_BYTES]; struct rpc_msg request, reply; - int superuser, auth_flavor, auth_len; + int auth_flavor, auth_len; struct ypresp_val reply_val; struct ypresp_key_val reply_key_val; struct ypresp_all reply_all; @@ -948,26 +948,22 @@ nis_process_request(struct plugin_state *state, slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "validated auth_sys creds\n"); - superuser = 0; break; case AUTH_NONE: slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "validated \"none\" creds\n"); - superuser = 0; break; default: slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "validated other creds\n"); - superuser = 0; break; } } else { slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "failed to validate client creds\n"); - superuser = 0; } auth_destroy(request_auth); |