From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2012 10:50:09 +0000 (+0200)
Subject: lib/util: let server_id_str() skip the task_id if 0 in the cluster case too
X-Git-Tag: samba-4.0.0beta7~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9;p=thirdparty%2Fsamba.git

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
---

diff --git a/lib/util/server_id.c b/lib/util/server_id.c
index d41fb0b2877..722230354c6 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",