From bb3dddcdf11e6c2f5319d64bf2ef20636d0ed82f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 18 Aug 2022 17:52:33 +0200 Subject: [PATCH] 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 Reviewed-by: Jeremy Allison --- source3/include/g_lock.h | 4 ++-- source3/lib/g_lock.c | 6 +++--- source3/locking/share_mode_lock.c | 16 ++++++++-------- source3/smbd/server.c | 2 +- source3/torture/test_g_lock.c | 12 ++++++------ source3/utils/net_g_lock.c | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/source3/include/g_lock.h b/source3/include/g_lock.h index 3a94879d209..749cb57ed45 100644 --- 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 d683c4ddee6..35279dddb76 100644 --- 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 dd19c53024b..cf1447d889e 100644 --- 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 7e2a10532f6..25cb84ab9d0 100644 --- 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 002e390af19..51133393960 100644 --- 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 90c0f15fe78..2a3b105b276 100644 --- 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) -- 2.47.3