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

4 files changed, 0 insertions, 25 deletions

diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c
index 767e6a719f..757489ebce 100644
--- a/source4/cluster/cluster.c
+++ b/source4/cluster/cluster.c
@@ -56,17 +56,6 @@ struct server_id cluster_id(uint64_t pid, uint32_t task_id)
 	return ops->cluster_id(ops, pid, task_id);
 }
 
-
-/*
-  return a server_id as a string
-*/
-char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id)
-{
-	cluster_init();
-	return ops->cluster_id_string(ops, mem_ctx, id);
-}
-
-
 /*
   open a temporary tdb in a cluster friendly manner
 */
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h
index a6f74f956c..3dd9f4ce7c 100644
--- a/source4/cluster/cluster.h
+++ b/source4/cluster/cluster.h
@@ -41,7 +41,6 @@ typedef void (*cluster_message_fn_t)(struct imessaging_context *, DATA_BLOB);
 
 /* prototypes */
 struct server_id cluster_id(uint64_t id, uint32_t task_id);
-char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id);
 struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags);
 void *cluster_backend_handle(void);
 
diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h
index 5f038dd92f..6f68ad62bd 100644
--- a/source4/cluster/cluster_private.h
+++ b/source4/cluster/cluster_private.h
@@ -24,8 +24,6 @@
 
 struct cluster_ops {
 	struct server_id (*cluster_id)(struct cluster_ops *ops, uint64_t id, uint32_t id2);
-	char *(*cluster_id_string)(struct cluster_ops *ops,
-				   TALLOC_CTX *, struct server_id );
 	struct tdb_wrap *(*cluster_tdb_tmp_open)(struct cluster_ops *,
 						 TALLOC_CTX *, 
 						 struct loadparm_context *,
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index e7b648fc9b..833a86b07f 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -42,16 +42,6 @@ static struct server_id local_id(struct cluster_ops *ops, uint64_t pid, uint32_t
 
 
 /*
-  return a server_id as a string
-*/
-static char *local_id_string(struct cluster_ops *ops,
-				   TALLOC_CTX *mem_ctx, struct server_id id)
-{
-	return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.vnn, (unsigned long long)id.pid, id.task_id);
-}
-
-
-/*
   open a tmp tdb for the local node. By using smbd_tmp_path() we don't need
   TDB_CLEAR_IF_FIRST as the tmp path is wiped at startup
 */
@@ -98,7 +88,6 @@ static NTSTATUS local_message_send(struct cluster_ops *ops,
 
 static struct cluster_ops cluster_local_ops = {
 	.cluster_id           = local_id,
-	.cluster_id_string    = local_id_string,
 	.cluster_tdb_tmp_open = local_tdb_tmp_open,
 	.backend_handle       = local_backend_handle,
 	.message_init         = local_message_init,