From: Stefan Metzmacher Date: Wed, 5 Aug 2026 19:39:28 +0000 (+0200) Subject: s3:cluster_level.idl: use non legacy timeval X-Git-Tag: samba-4.25.0rc1~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3021651a3823c34e366f05020162753e31f2d100;p=thirdparty%2Fsamba.git s3:cluster_level.idl: use non legacy timeval I was wondering about 44 bytes from the beginning, but only looking at a hexdump of the record revealed where the last 20 bytes came from. 4 bytes alignment, 8 bytes tv_sec, 4 bytes tv_usec. Signed-off-by: Stefan Metzmacher --- diff --git a/source3/lib/cluster_level_db.c b/source3/lib/cluster_level_db.c index 9637700459a..92ce8a939e6 100644 --- a/source3/lib/cluster_level_db.c +++ b/source3/lib/cluster_level_db.c @@ -159,7 +159,7 @@ static NTSTATUS cluster_level_db_store_active( struct cluster_level_globalB globalB = { .version = version, }; -#define CLUSTER_LEVEL_DB_VERSION_1_REC_SIZE 44 +#define CLUSTER_LEVEL_DB_VERSION_1_REC_SIZE 28 uint8_t fixed_buf[CLUSTER_LEVEL_DB_VERSION_1_REC_SIZE] = {}; DATA_BLOB fixed_blob = { .data = fixed_buf, diff --git a/source3/librpc/idl/cluster_level.idl b/source3/librpc/idl/cluster_level.idl index bc8fcc3d829..efb6aba449e 100644 --- a/source3/librpc/idl/cluster_level.idl +++ b/source3/librpc/idl/cluster_level.idl @@ -260,7 +260,7 @@ interface cluster_level } cluster_level_db_version; typedef struct { - timeval_legacy update_time; + timeval update_time; cluster_level_active active_level; } cluster_level_global1; @@ -276,8 +276,8 @@ interface cluster_level const string CLUSTER_LEVEL_GLOBAL_KEY = "CLUSTER_LEVEL_GLOBAL"; typedef struct { - timeval_legacy update_time; - timeval_legacy ctdbd_start_time; + timeval update_time; + timeval ctdbd_start_time; uint32 ctdbd_pid; cluster_level_ranges supported_ranges; } cluster_level_node1;