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 4a19f888632c1aa91669d0120eba56dfe503405c..fd90e8d734a8842bc312fdc251472abaabf6e1fe 100644 (file)
--- 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;