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 <metze@samba.org>

diff --git a/source3/lib/cluster_level_db.c b/source3/lib/cluster_level_db.c
index 9637700459a8f336369ec36608cde5e12d8fbff0..92ce8a939e6b0cd19598254118abb913d4fab544 100644 (file)
--- 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 bc8fcc3d829242e6c4ef8aba9fd5126bf8ab2333..efb6aba449eee3d9ea096a6426838ee79339c476 100644 (file)
--- 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;