diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-08-17 12:50:09 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-08-17 20:07:07 +0200 |
| commit | 3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9 (patch) | |
| tree | 4f9b0674d760d1c15d2dbe52fbda2c22ec06c12f | |
| parent | 6457fb5c39fd49fab2a804241de22e0e081093f4 (diff) | |
| download | samba-3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9.tar.gz samba-3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9.tar.bz2 samba-3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9.zip | |
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
| -rw-r--r-- | lib/util/server_id.c | 5 |
1 files changed, 5 insertions, 0 deletions
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", |