diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/back-shr.c | 4 | ||||
| -rw-r--r-- | src/disp-nis.c | 33 | ||||
| -rw-r--r-- | src/format.c | 6 | ||||
| -rw-r--r-- | src/nis.c | 10 |
4 files changed, 28 insertions, 25 deletions
diff --git a/src/back-shr.c b/src/back-shr.c index e101d0c..553de55 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -1569,14 +1569,14 @@ backend_shr_modrdn_cb(Slapi_PBlock *pb) slapi_log_error(SLAPI_LOG_PLUGIN, cbdata.state->plugin_desc->spd_id, "renamed entry \"%s\" was a set\n", - cbdata.e_pre); + slapi_entry_get_ndn(cbdata.e_pre)); backend_set_config_entry_delete_cb(cbdata.e_pre, cbdata.state); } if (backend_shr_entry_is_a_set(cbdata.state, pb, cbdata.e_post)) { slapi_log_error(SLAPI_LOG_PLUGIN, cbdata.state->plugin_desc->spd_id, "renamed entry \"%s\" is now a set\n", - cbdata.e_post); + slapi_entry_get_ndn(cbdata.e_post)); backend_set_config_entry_add_cb(cbdata.e_post, cbdata.state); } map_unlock(); diff --git a/src/disp-nis.c b/src/disp-nis.c index ceccda4..f8bca15 100644 --- a/src/disp-nis.c +++ b/src/disp-nis.c @@ -407,9 +407,10 @@ dispatch_reply_fragment_connected(struct plugin_state *state, cdata->connected->client_outbuf_used += (4 + xdr_getpos(reply_xdrs)); slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "queued stream reply (4+%d bytes), %d total in queue\n", + "queued stream reply (4+%d bytes), " + "%ld total in queue\n", xdr_getpos(reply_xdrs), - cdata->connected->client_outbuf_used); + (long) cdata->connected->client_outbuf_used); return TRUE; } /* Send an entire reply record at once. */ @@ -688,8 +689,8 @@ client_read(struct plugin_state *state, struct dispatch_client *client) client->client_inbuf_used += count; slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "have %d bytes from %d\n", - client->client_inbuf_used, + "have %ld bytes from %d\n", + (long) client->client_inbuf_used, client->client_fd); /* Check if we've got a complete fragment. */ if (client->client_inbuf_used < 4) { @@ -713,9 +714,10 @@ client_read(struct plugin_state *state, struct dispatch_client *client) slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "fragment is %d bytes long%s, " - "have %d bytes pending, on %d\n", + "have %ld bytes pending, on %d\n", len, last ? " (last one)" : "", - client->client_inbuf_used, client->client_fd); + (long) client->client_inbuf_used, + client->client_fd); if ((len + 4) <= client->client_inbuf_used) { /* Got at least one fragment! */ nlen = len + client->client_query_size; @@ -753,16 +755,16 @@ client_read(struct plugin_state *state, struct dispatch_client *client) slapi_log_error(SLAPI_LOG_FATAL, state->plugin_desc->spd_id, "client request claims to be " - "%d bytes long, assuming it's " + "%ld bytes long, assuming it's " "an error\n", - client->client_query_size); + (long) client->client_query_size); client_set_closing(state, client); return; } slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "query is %d bytes long on %d\n", - client->client_query_size, + "query is %ld bytes long on %d\n", + (long) client->client_query_size, client->client_fd); /* We have a complete query. Pass it on down. */ memset(&client_data, 0, sizeof(client_data)); @@ -801,8 +803,8 @@ client_write(struct plugin_state *state, struct dispatch_client *client) if ((count != -1) || (errno != EAGAIN)) { slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "error sending %d bytes to %d\n", - client->client_outbuf_used, + "error sending %ld bytes to %d\n", + (long) client->client_outbuf_used, client->client_fd); /* Fail, disconnect because we're out of sync. */ client_set_closing(state, client); @@ -810,7 +812,8 @@ client_write(struct plugin_state *state, struct dispatch_client *client) return; } slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "sent %d bytes to %d\n", count, client->client_fd); + "sent %ld bytes to %d\n", (long) count, + client->client_fd); if (count == client->client_outbuf_used) { /* There's no more data to send. */ if (client->client_state == client_replying_final) { @@ -847,8 +850,8 @@ client_write(struct plugin_state *state, struct dispatch_client *client) client->client_outbuf_used - count); client->client_outbuf_used -= count; slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "%d bytes to go for %d\n", - client->client_outbuf_used, + "%ld bytes to go for %d\n", + (long) client->client_outbuf_used, client->client_fd); } } diff --git a/src/format.c b/src/format.c index 93dcb2b..050ca50 100644 --- a/src/format.c +++ b/src/format.c @@ -3349,9 +3349,9 @@ format_get_data_set(struct plugin_state *state, Slapi_Entry *e, for (i = 0; i < this_choice->n_values; i++) { slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "choice: %d at %d\n", - this_choice->values[i]->bv_len, - this_choice->offset - template); + "choice: %ld at %ld\n", + (long) this_choice->values[i]->bv_len, + (long) this_choice->offset); } combinations *= this_choice->n_values; } @@ -74,7 +74,7 @@ nis_domain(struct plugin_state *state, } else { slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "domain(%s) -> %d (no reply)\n", + "domain(%s) -> %s (no reply)\n", domain, *reply_bool ? "TRUE" : "FALSE"); } map_unlock(); @@ -914,10 +914,10 @@ nis_process_request(struct plugin_state *state, /* Now we know we've got a request to respond to. */ slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, - "client request prog=%d,ver=%d,proc=%d\n", - request.rm_call.cb_prog, - request.rm_call.cb_vers, - request.rm_call.cb_proc); + "client request prog=%ld,ver=%ld,proc=%ld\n", + (long) request.rm_call.cb_prog, + (long) request.rm_call.cb_vers, + (long) request.rm_call.cb_proc); xdrmem_create(&reply_xdrs, reply_buf, reply_buf_size, XDR_ENCODE); /* Validate the client's credentials. */ |