summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-06-03 13:11:05 +0000
committerJeremy Allison <jra@samba.org>2014-06-17 09:27:06 +0200
commit35dd4de8868ec9b00f105a889899b0c5f2c97b1b (patch)
tree52b88efea0e9245e29cb61d7f795b523e14b6ec3
parentf0e1a8e1e2f67cc18099c3c56b99777bc7ef7b7f (diff)
downloadsamba-35dd4de8868ec9b00f105a889899b0c5f2c97b1b.zip
samba-35dd4de8868ec9b00f105a889899b0c5f2c97b1b.tar.gz
samba-35dd4de8868ec9b00f105a889899b0c5f2c97b1b.tar.xz
messaging3: Use server_id_str_buf
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Jun 17 09:27:07 CEST 2014 on sn-devel-104
-rw-r--r--source3/lib/messages_dgm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index ba13fc9..c3ab0d1 100644
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -301,6 +301,7 @@ static NTSTATUS messaging_dgm_send(struct server_id src,
struct messaging_dgm_hdr hdr;
struct iovec iov2[iovlen + 1];
ssize_t pathlen;
+ struct server_id_buf idbuf;
int ret;
fstr_sprintf(pid_str, "msg/%u", (unsigned)pid.pid);
@@ -318,7 +319,7 @@ static NTSTATUS messaging_dgm_send(struct server_id src,
DEBUG(10, ("%s: Sending message 0x%x to %s\n", __func__,
(unsigned)hdr.msg_type,
- server_id_str(talloc_tos(), &pid)));
+ server_id_str_buf(pid, &idbuf)));
iov2[0].iov_base = &hdr;
iov2[0].iov_len = sizeof(hdr);
@@ -344,6 +345,7 @@ static void messaging_dgm_recv(struct unix_msg_ctx *ctx,
private_data, struct messaging_dgm_context);
struct messaging_dgm_hdr *hdr;
struct messaging_rec rec;
+ struct server_id_buf idbuf;
if (msg_len < sizeof(*hdr)) {
DEBUG(1, ("message too short: %u\n", (unsigned)msg_len));
@@ -364,7 +366,7 @@ static void messaging_dgm_recv(struct unix_msg_ctx *ctx,
DEBUG(10, ("%s: Received message 0x%x len %u from %s\n", __func__,
(unsigned)hdr->msg_type, (unsigned)rec.buf.length,
- server_id_str(talloc_tos(), &rec.src)));
+ server_id_str_buf(rec.src, &idbuf)));
messaging_dispatch_rec(dgm_ctx->msg_ctx, &rec);
}