[PATCH] use server_id_str_buf in smbcontrol

[Volker Lendecke]

Hi!

Review&push would be appreciated!

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 24002fb4ee91c607c0fdf695cc071d284b71de25 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 4 Nov 2014 13:59:25 +0100
Subject: [PATCH] smbcontrol: Use server_id_str_buf

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/utils/smbcontrol.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 10ab61d..9e6b963 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -121,12 +121,10 @@ static void print_pid_string_cb(struct messaging_context *msg,
 				struct server_id pid,
 				DATA_BLOB *data)
 {
-	char *pidstr;
+	struct server_id_buf pidstr;
 
-	pidstr = server_id_str(talloc_tos(), &pid);
-	printf("PID %s: %.*s", pidstr, (int)data->length,
-	       (const char *)data->data);
-	TALLOC_FREE(pidstr);
+	printf("PID %s: %.*s", server_id_str_buf(pid, &pidstr),
+	       (int)data->length, (const char *)data->data);
 	num_replies++;
 }
 
@@ -442,9 +440,8 @@ static void pong_cb(struct messaging_context *msg,
 		    struct server_id pid,
 		    DATA_BLOB *data)
 {
-	char *src_string = server_id_str(NULL, &pid);
-	printf("PONG from pid %s\n", src_string);
-	TALLOC_FREE(src_string);
+	struct server_id_buf src_string;
+	printf("PONG from pid %s\n", server_id_str_buf(pid, &src_string));
 	num_replies++;
 }
 
@@ -1219,10 +1216,10 @@ static void winbind_validate_cache_cb(struct messaging_context *msg,
 				      struct server_id pid,
 				      DATA_BLOB *data)
 {
-	char *src_string = server_id_str(NULL, &pid);
+	struct server_id_buf src_string;
 	printf("Winbindd cache is %svalid. (answer from pid %s)\n",
-	       (*(data->data) == 0 ? "" : "NOT "), src_string);
-	TALLOC_FREE(src_string);
+	       (*(data->data) == 0 ? "" : "NOT "),
+	       server_id_str_buf(pid, &src_string));
 	num_replies++;
 }
 
-- 
1.9.1