smbstatus: add server_id to byte-range locks

Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 2b2fab672579d481e3aafe995f968ec63f89eed5..97e4f71cc7d19dbbe25eabaa13fe8f4389e25446 100644 (file)
--- 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 a13eb47a53bcc24543ae44c9f1f6693328758165..30b12c46fed48781ff7b50fdeafb735e0d23f8b7 100644 (file)
--- 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 2a4f5335d652c134c89f65c1a4fe22c9972c75a1..04b44678db4cea3e82c864edc9dd470a5fc8e385 100644 (file)
--- 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 ad8e70c9c6feba3af2d201dacc72abaadf12b7cb..9a2ccc3db8267637f3bdc785ab7f541f9de3c3d1 100644 (file)
--- 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)
 {