summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 5fb8a41dae..499f5f7f6b 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1971,16 +1971,26 @@ struct server_id interpret_pid(const char *pid_string)
ZERO_STRUCT(result);
- /* We accept either the 2 or 3 componet form for backwards compatability in the smbstatus command line tool */
- if (sscanf(pid_string, "%u:%llu:%u", &vnn, &pid, &task_id) >= 2) {
+ /* We accept various forms with 1, 2 or 3 component forms
+ * because the server_id_str() can print different forms, and
+ * we want backwards compatibility for scripts that may call
+ * smbclient. */
+ if (sscanf(pid_string, "%u:%llu.%u", &vnn, &pid, &task_id) == 3) {
result.vnn = vnn;
result.pid = pid;
result.task_id = task_id;
+ } else if (sscanf(pid_string, "%u:%llu", &vnn, &pid) == 2) {
+ result.vnn = vnn;
+ result.pid = pid;
+ result.task_id = 0;
+ } else if (sscanf(pid_string, "%llu.%u", &pid, &task_id) == 2) {
+ result.vnn = get_my_vnn();
+ result.pid = pid;
+ result.task_id = task_id;
} else if (sscanf(pid_string, "%d", &pid) == 1) {
result.vnn = get_my_vnn();
result.pid = pid;
- }
- else {
+ } else {
result.vnn = NONCLUSTER_VNN;
result.pid = (uint64_t)-1;
}