[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  460fd441d7f s3:winbind: Improve warning message if we are out of autorid ranges
       via  a273ed89dbb s3:utils: Check if the autorid rangesize is a multiple of the range
      from  bf9130d375b smbd: Fix case normalization in for directories

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 460fd441d7f2ed5372038beec68c9bcd928a4f4c
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Feb 27 12:14:41 2023 +0100

    s3:winbind: Improve warning message if we are out of autorid ranges
    
    The message should help our users to understand what's the problem. The
    message was rather cryptic before.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Tue Feb 28 14:18:32 UTC 2023 on atb-devel-224

commit a273ed89dbb42081925f95b6d5490018c7cad110
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Feb 27 10:01:16 2023 +0100

    s3:utils: Check if the autorid rangesize is a multiple of the range
    
    We also have this in our documentation.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/testparm.c             | 11 +++++++++++
 source3/winbindd/idmap_autorid_tdb.c | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index b975188094c..ce624c9d0cd 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -192,6 +192,17 @@ static bool do_idmap_check(void)
 			uint32_t maxranges =
 				(c->high - c->low  + 1) / rangesize;
 
+			if (((c->high - c->low  + 1) % rangesize) != 0) {
+				fprintf(stderr,
+					"WARNING: The idmap autorid range "
+					"[%u-%u] SHOULD to be a multiple of "
+					"the rangesize [%u]!"
+					"\n\n",
+					c->low,
+					c->high,
+					rangesize);
+			}
+
 			if (maxranges < 2) {
 				fprintf(stderr,
 					"ERROR: The idmap autorid range "
diff --git a/source3/winbindd/idmap_autorid_tdb.c b/source3/winbindd/idmap_autorid_tdb.c
index 24cf380945d..fb195367da6 100644
--- a/source3/winbindd/idmap_autorid_tdb.c
+++ b/source3/winbindd/idmap_autorid_tdb.c
@@ -183,10 +183,14 @@ static NTSTATUS idmap_autorid_addrange_action(struct db_context *db,
 	}
 
 	if (requested_rangenum >= globalcfg.maxranges) {
-		DEBUG(1, ("Not enough ranges available: New range %u must be "
-			  "smaller than configured maximum number of ranges "
-			  "(%u).\n",
-			  requested_rangenum, globalcfg.maxranges));
+		DBG_WARNING("Not enough ranges available: New range %u can't "
+			    "be allocated. Consider increasing the range "
+			    "[%u-%u] by %u.\n",
+			   requested_rangenum,
+			   globalcfg.minvalue,
+			   globalcfg.minvalue +
+				(globalcfg.maxranges * globalcfg.rangesize),
+			   globalcfg.rangesize);
 		ret = NT_STATUS_NO_MEMORY;
 		goto error;
 	}


-- 
Samba Shared Repository