s3:g_lock: add some const to the shared array passed via g_lock_dump*()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/g_lock.h b/source3/include/g_lock.h
index 3a94879d209f6d6eb93c3952467eee61d9a101ae..749cb57ed458ae59bae4fa514b683311026d65e9 100644 (file)
--- a/source3/include/g_lock.h
+++ b/source3/include/g_lock.h
@@ -71,7 +71,7 @@ struct tevent_req *g_lock_dump_send(
        TDB_DATA key,
        void (*fn)(struct server_id exclusive,
                   size_t num_shared,
-                  struct server_id *shared,
+                  const struct server_id *shared,
                   const uint8_t *data,
                   size_t datalen,
                   void *private_data),
@@ -81,7 +81,7 @@ NTSTATUS g_lock_dump(struct g_lock_ctx *ctx,
                     TDB_DATA key,
                     void (*fn)(struct server_id exclusive,
                                size_t num_shared,
-                               struct server_id *shared,
+                               const struct server_id *shared,
                                const uint8_t *data,
                                size_t datalen,
                                void *private_data),

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index d683c4ddee6f42f9217bfbad0b5cb393dacad5de..35279dddb76f2fbbda4e9b460fb0b11439b3954b 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -1210,7 +1210,7 @@ struct g_lock_dump_state {
        TDB_DATA key;
        void (*fn)(struct server_id exclusive,
                   size_t num_shared,
-                  struct server_id *shared,
+                  const struct server_id *shared,
                   const uint8_t *data,
                   size_t datalen,
                   void *private_data);
@@ -1265,7 +1265,7 @@ static void g_lock_dump_fn(TDB_DATA key, TDB_DATA data,
 NTSTATUS g_lock_dump(struct g_lock_ctx *ctx, TDB_DATA key,
                     void (*fn)(struct server_id exclusive,
                                size_t num_shared,
-                               struct server_id *shared,
+                               const struct server_id *shared,
                                const uint8_t *data,
                                size_t datalen,
                                void *private_data),
@@ -1300,7 +1300,7 @@ struct tevent_req *g_lock_dump_send(
        TDB_DATA key,
        void (*fn)(struct server_id exclusive,
                   size_t num_shared,
-                  struct server_id *shared,
+                  const struct server_id *shared,
                   const uint8_t *data,
                   size_t datalen,
                   void *private_data),

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index dd19c53024b9119df191f95e7a173bac4a160d06..cf1447d889efca5f09ff0bf0a2f4a709f20eabf1 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -468,7 +468,7 @@ struct locking_tdb_data_fetch_state {
 static void locking_tdb_data_fetch_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)
@@ -768,7 +768,7 @@ struct get_static_share_mode_data_state {
 static void get_static_share_mode_data_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)
@@ -1017,7 +1017,7 @@ struct share_mode_do_locked_state {
 static void share_mode_do_locked_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)
@@ -1324,7 +1324,7 @@ struct fetch_share_mode_unlocked_state {
 static void fetch_share_mode_unlocked_parser(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)
@@ -1395,7 +1395,7 @@ struct fetch_share_mode_state {
 static void fetch_share_mode_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data);
@@ -1460,7 +1460,7 @@ struct tevent_req *fetch_share_mode_send(TALLOC_CTX *mem_ctx,
 static void fetch_share_mode_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)
@@ -1564,7 +1564,7 @@ struct share_mode_forall_state {
 static void share_mode_forall_dump_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)
@@ -2108,7 +2108,7 @@ struct share_mode_count_entries_state {
 static void share_mode_count_entries_fn(
        struct server_id exclusive,
        size_t num_shared,
-       struct server_id *shared,
+       const struct server_id *shared,
        const uint8_t *data,
        size_t datalen,
        void *private_data)

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 7e2a10532f6df426401fa8a76ebd09b79bdf6da8..25cb84ab9d06c6117b70a1b737c0e9f7a4fc515b 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1436,7 +1436,7 @@ struct smbd_claim_version_state {
 
 static void smbd_claim_version_parser(struct server_id exclusive,
                                      size_t num_shared,
-                                     struct server_id *shared,
+                                     const struct server_id *shared,
                                      const uint8_t *data,
                                      size_t datalen,
                                      void *private_data)

diff --git a/source3/torture/test_g_lock.c b/source3/torture/test_g_lock.c
index 002e390af19052381ae836748132f668f205daee..5113339396091e9e67abcbb710a232171d225ac8 100644 (file)
--- a/source3/torture/test_g_lock.c
+++ b/source3/torture/test_g_lock.c
@@ -115,7 +115,7 @@ struct lock2_parser_state {
 
 static void lock2_parser(struct server_id exclusive,
                         size_t num_shared,
-                        struct server_id *shared,
+                        const struct server_id *shared,
                         const uint8_t *data,
                         size_t datalen,
                         void *private_data)
@@ -216,14 +216,14 @@ struct lock3_parser_state {
 
 static void lock3_parser(struct server_id exclusive,
                         size_t num_shared,
-                        struct server_id *shared,
+                        const struct server_id *shared,
                         const uint8_t *data,
                         size_t datalen,
                         void *private_data)
 {
        struct lock3_parser_state *state = private_data;
        size_t num_locks = num_shared + ((exclusive.pid != 0) ? 1 : 0);
-       struct server_id *pid;
+       const struct server_id *pid;
 
        if (datalen != 0) {
                fprintf(stderr, "datalen=%zu\n", datalen);
@@ -423,7 +423,7 @@ struct lock4_check_state {
 
 static void lock4_check(struct server_id exclusive,
                        size_t num_shared,
-                       struct server_id *shared,
+                       const struct server_id *shared,
                        const uint8_t *data,
                        size_t datalen,
                        void *private_data)
@@ -712,7 +712,7 @@ struct lock5_parser_state {
 
 static void lock5_parser(struct server_id exclusive,
                         size_t num_shared,
-                        struct server_id *shared,
+                        const struct server_id *shared,
                         const uint8_t *data,
                         size_t datalen,
                         void *private_data)
@@ -859,7 +859,7 @@ struct lock6_parser_state {
 
 static void lock6_parser(struct server_id exclusive,
                         size_t num_shared,
-                        struct server_id *shared,
+                        const struct server_id *shared,
                         const uint8_t *data,
                         size_t datalen,
                         void *private_data)

diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c
index 90c0f15fe780bfed629cefee2db6f23c4d4c1f9a..2a3b105b2760a0174011f0c868ed974425414e2b 100644 (file)
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -113,7 +113,7 @@ done:
 
 static void net_g_lock_dump_fn(struct server_id exclusive,
                                size_t num_shared,
-                               struct server_id *shared,
+                               const struct server_id *shared,
                                const uint8_t *data,
                                size_t datalen,
                                void *private_data)