From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 7 Aug 2026 10:58:39 +0000 (+0200)
Subject: s3:cluster_support: prepare support for multiple ranges with major level 0
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=dbdc899ea320e5dc4e4ac8d5a9b2b211fb01a881;p=thirdparty%2Fsamba.git

s3:cluster_support: prepare support for multiple ranges with major level 0

When we want to add support for upgrading from Samba versions before
4.25 we likely need to support multiple ranges with major level 0.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/lib/cluster_support.c b/source3/lib/cluster_support.c
index 5664dc0af55..ea6b36cf6ed 100644
--- a/source3/lib/cluster_support.c
+++ b/source3/lib/cluster_support.c
@@ -66,18 +66,18 @@ bool cluster_support_available(void)
 	BUILD_ASSERT( \
 		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_ ## __minor_min \
 		== (__minor_min)); \
-	BUILD_ASSERT( \
+	BUILD_ASSERT((__major) == 0 || \
 		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_MIN \
 		== (__minor_min)); \
 	BUILD_ASSERT( \
 		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_ ## __minor_max \
 		== (__minor_max)); \
-	BUILD_ASSERT( \
+	BUILD_ASSERT((__major) == 0 || \
 		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_MAX \
 		== (__minor_max)); \
 	BUILD_ASSERT((__minor_min)  <= __minor_max); \
 	BUILD_ASSERT((__major)     < UINT8_MAX); \
-	BUILD_ASSERT((__minor_max) < UINT8_MAX); \
+	BUILD_ASSERT((__major) == 0 || (__minor_max) < UINT8_MAX); \
 	BUILD_ASSERT((__major) != 0 || (__minor_max) != 0);
 	CFL_ALL_RANGES
 #undef CFL_RANGE
@@ -238,9 +238,9 @@ static const struct cluster_level_range supported_ranges[] = {
 		.major = \
 		CLUSTER_LEVEL_MAJOR_ ## __major, \
 		.minor_min = \
-		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_MIN, \
+		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_ ## __minor_min, \
 		.minor_max = \
-		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_MAX, \
+		CLUSTER_LEVEL_MAJOR_ ## __major  ## _MINOR_ ## __minor_max, \
 	},
 	CFL_ALL_RANGES
 #undef CFL_RANGE
@@ -286,6 +286,17 @@ static void cluster_level_range_asserts(void)
 	SMB_ASSERT(supported_ranges[0].minor_max ==
 		   CLUSTER_LEVEL_MAJOR_LATEST_MINOR_MAX);
 	for (i = 1; i < ARRAY_SIZE(supported_ranges); i++) {
+		if (supported_ranges[i-1].major == 0) {
+			/*
+			 * For legacy upgrades we use allow
+			 * multiple ranges with major level 0.
+			 */
+			SMB_ASSERT(supported_ranges[i].major == 0);
+			SMB_ASSERT(supported_ranges[i-1].minor_min >
+				   supported_ranges[i].minor_max);
+			continue;
+		}
+
 		SMB_ASSERT(supported_ranges[i-1].major >
 			   supported_ranges[i].major);
 	}