diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-08 14:05:55 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:09 +0200 |
| commit | 16b1c77644217796f70a3a0bf1d95c245f9ee2d9 (patch) | |
| tree | b08d316880e1a03d1a7fad4c5ced8d141878986c /source4/lib/messaging | |
| parent | d01dbd6c3fd9ca2595d65991b56db4400a35ece0 (diff) | |
| download | samba-16b1c77644217796f70a3a0bf1d95c245f9ee2d9.tar.gz samba-16b1c77644217796f70a3a0bf1d95c245f9ee2d9.tar.bz2 samba-16b1c77644217796f70a3a0bf1d95c245f9ee2d9.zip | |
lib/util Bring procid_str() into lib/util as server_id_string()
This is needed for OpenChange, which prints Samba struct server_id
values in debug messages.
Andrew Bartlett
Diffstat (limited to 'source4/lib/messaging')
| -rw-r--r-- | source4/lib/messaging/messaging.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 3a330d5794..aa1b43308f 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -109,7 +109,7 @@ static void irpc_handler(struct imessaging_context *, void *, static void ping_message(struct imessaging_context *msg, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data) { - char *task_id = cluster_id_string(NULL, src); + char *task_id = server_id_str(NULL, &src); DEBUG(1,("INFO: Received PING message from server %s [%.*s]\n", task_id, (int)data->length, data->data?(const char *)data->data:"")); @@ -134,7 +134,7 @@ static NTSTATUS irpc_uptime(struct irpc_message *msg, static char *imessaging_path(struct imessaging_context *msg, struct server_id server_id) { TALLOC_CTX *tmp_ctx = talloc_new(msg); - const char *id = cluster_id_string(tmp_ctx, server_id); + const char *id = server_id_str(tmp_ctx, &server_id); char *s; if (id == NULL) { return NULL; @@ -284,8 +284,8 @@ static void imessaging_send_handler(struct imessaging_context *msg) if (!NT_STATUS_IS_OK(status)) { TALLOC_CTX *tmp_ctx = talloc_new(msg); DEBUG(1,("messaging: Lost message from %s to %s of type %u - %s\n", - cluster_id_string(tmp_ctx, rec->header->from), - cluster_id_string(tmp_ctx, rec->header->to), + server_id_str(tmp_ctx, &rec->header->from), + server_id_str(tmp_ctx, &rec->header->to), rec->header->msg_type, nt_errstr(status))); talloc_free(tmp_ctx); |