From 3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2012 12:50:09 +0200
Subject: lib/util: let server_id_str() skip the task_id if 0 in the cluster
 case too

server_id_from_string() already handles that case.

metze
---
 lib/util/server_id.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/util')

diff --git a/lib/util/server_id.c b/lib/util/server_id.c
index d41fb0b287..722230354c 100644
--- a/lib/util/server_id.c
+++ b/lib/util/server_id.c
@@ -52,6 +52,11 @@ char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id)
 				       "%llu.%u",
 				       (unsigned long long)id->pid,
 				       (unsigned)id->task_id);
+	} else if (id->task_id == 0) {
+		return talloc_asprintf(mem_ctx,
+				       "%u:%llu",
+				       (unsigned)id->vnn,
+				       (unsigned long long)id->pid);
 	} else {
 		return talloc_asprintf(mem_ctx,
 				       "%u:%llu.%u",
-- 
cgit