lib: Remove procid_str_static

Replace all callers with direct calls to server_id_str_buf without
talloc_tos()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index be24fec5732..9dbb1a45847 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -34,6 +34,7 @@ int net_status_usage(struct net_context *c, int argc, const char **argv)
 static int show_session(const char *key, struct sessionid *session,
 			void *private_data)
 {
+	struct server_id_buf tmp;
 	bool *parseable = (bool *)private_data;
 
 	if (!process_exists(session->pid)) {
@@ -42,13 +43,13 @@ static int show_session(const char *key, struct sessionid *session,
 
 	if (*parseable) {
 		d_printf("%s\\%s\\%s\\%s\\%s\n",
-			 procid_str_static(&session->pid),
+			 server_id_str_buf(session->pid, &tmp),
 			 uidtoname(session->uid),
 			 gidtoname(session->gid),
 			 session->remote_machine, session->hostname);
 	} else {
 		d_printf("%7s   %-12s  %-12s  %-12s (%s)\n",
-			 procid_str_static(&session->pid),
+			 server_id_str_buf(session->pid, &tmp),
 			 uidtoname(session->uid),
 			 gidtoname(session->gid),
 			 session->remote_machine, session->hostname);
@@ -95,6 +96,8 @@ static int show_share(const struct connections_key *key,
 		      const struct connections_data *crec,
 		      void *state)
 {
+	struct server_id_buf tmp;
+
 	if (crec->cnum == TID_FIELD_INVALID)
 		return 0;
 
@@ -103,7 +106,7 @@ static int show_share(const struct connections_key *key,
 	}
 
 	d_printf("%-10.10s   %s   %-12s  %s",
-	       crec->servicename, procid_str_static(&crec->pid),
+	       crec->servicename, server_id_str_buf(crec->pid, &tmp),
 	       crec->machine,
 	       time_to_asc(crec->start));
 
@@ -139,6 +142,7 @@ static int show_share_parseable(const struct connections_key *key,
 				void *state)
 {
 	struct sessionids *ids = (struct sessionids *)state;
+	struct server_id_buf tmp;
 	int i;
 	bool guest = true;
 
@@ -158,7 +162,7 @@ static int show_share_parseable(const struct connections_key *key,
 	}
 
 	d_printf("%s\\%s\\%s\\%s\\%s\\%s\\%s",
-		 crec->servicename,procid_str_static(&crec->pid),
+		 crec->servicename, server_id_str_buf(crec->pid, &tmp),
 		 guest ? "" : uidtoname(ids->entries[i].uid),
 		 guest ? "" : gidtoname(ids->entries[i].gid),
 		 crec->machine,