From eca61089cdabd22057fce63adf6dba15128af27a Mon Sep 17 00:00:00 2001 From: Jule Anger Date: Mon, 2 May 2022 10:57:28 +0200 Subject: [PATCH] smbstatus: add server_id to byte-range locks Signed-off-by: Jule Anger Reviewed-by: Ralph Boehme --- source3/utils/status.c | 1 + source3/utils/status_json.c | 5 +++++ source3/utils/status_json.h | 1 + source3/utils/status_json_dummy.c | 1 + 4 files changed, 8 insertions(+) diff --git a/source3/utils/status.c b/source3/utils/status.c index 2b2fab67257..97e4f71cc7d 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -411,6 +411,7 @@ static void print_brl(struct file_id id, fname); } else { print_brl_json(state, + pid, sharepath, fname); diff --git a/source3/utils/status_json.c b/source3/utils/status_json.c index a13eb47a53b..30b12c46fed 100644 --- a/source3/utils/status_json.c +++ b/source3/utils/status_json.c @@ -966,6 +966,7 @@ failure: } int print_brl_json(struct traverse_state *state, + const struct server_id server_id, const char *sharepath, const char *filename) { @@ -1005,6 +1006,10 @@ int print_brl_json(struct traverse_state *state, if (result < 0) { goto failure; } + result = add_server_id_to_json(&file_json, server_id); + if (result < 0) { + goto failure; + } result = json_add_object(&brl_json, key, &file_json); if (result < 0) { diff --git a/source3/utils/status_json.h b/source3/utils/status_json.h index 2a4f5335d65..04b44678db4 100644 --- a/source3/utils/status_json.h +++ b/source3/utils/status_json.h @@ -54,6 +54,7 @@ int print_share_mode_json(struct traverse_state *state, const char *filename); int print_brl_json(struct traverse_state *state, + const struct server_id server_id, const char *sharepath, const char *filename); diff --git a/source3/utils/status_json_dummy.c b/source3/utils/status_json_dummy.c index ad8e70c9c6f..9a2ccc3db82 100644 --- a/source3/utils/status_json_dummy.c +++ b/source3/utils/status_json_dummy.c @@ -71,6 +71,7 @@ int print_share_mode_json(struct traverse_state *state, } int print_brl_json(struct traverse_state *state, + const struct server_id server_id, const char *sharepath, const char *filename) { -- 2.47.3