From: Samuel Cabrero <scabrero@samba.org>
Date: Tue, 26 Sep 2023 11:01:03 +0000 (+0200)
Subject: testparm: Allow idmap ranges overlap for idmap_nss
X-Git-Tag: tevent-0.16.0~495
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7394a90f51e9a2caac58d280e2ec3331f45a315;p=thirdparty%2Fsamba.git

testparm: Allow idmap ranges overlap for idmap_nss

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Sep 26 19:28:08 UTC 2023 on atb-devel-224
---

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 4a19f888632..fd90e8d734a 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -229,16 +229,21 @@ static bool do_idmap_check(void)
 
 			if ((c->low >= x->low && c->low <= x->high) ||
 			    (c->high >= x->low && c->high <= x->high)) {
-				/* Allow overlapping ranges for idmap_ad */
+				/*
+				 * Allow overlapping ranges for idmap_ad
+				 * and idmap_nss
+				 */
 				ok = strequal(c->backend, x->backend);
 				if (ok) {
-					ok = strequal(c->backend, "ad");
+					ok = strequal(c->backend, "ad") ||
+					     strequal(c->backend, "nss");
 					if (ok) {
 						fprintf(stderr,
-							"NOTE: The idmap_ad "
+							"NOTE: The idmap_%s "
 							"range for the domain "
 							"%s overlaps with the "
 							"range of %s.\n\n",
+							c->backend,
 							c->domain_name,
 							x->domain_name);
 						continue;