sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

autorid: when storing a new range, always check it does not exist.

Browse Source 
Also check for existence when the range is >= the HWM,
typically the "acquire" case where we bump the HWM.
In case of external modification, we would previously
simply overwrite an an existing range mapping. Now we
check and throw INTERNAL_DB_CORRUPTION in this case.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Michael Adam 2014-03-20 15:22:40 +01:00 committed by Jeremy Allison
parent 0bfb078719
commit 38157a093b
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source3/winbindd/idmap_autorid_tdb.c
View File

@ -175,26 +175,33 @@ static NTSTATUS idmap_autorid_addrange_action(struct db_context *db,
goto error;
}
if (requested_rangenum < hwm) {
/*
* Set a specified range below the HWM:
* We need to check that it is not yet taken.
*/
/*
* Check that it is not yet taken.
* If the range is requested and < HWM, we need
* to check anyways, and otherwise, we also better
* check in order to prevent further corruption
* in case the db has been externally modified.
*/
numstr = talloc_asprintf(mem_ctx, "%u", requested_rangenum);
if (!numstr) {
ret = NT_STATUS_NO_MEMORY;
goto error;
}
numstr = talloc_asprintf(mem_ctx, "%u", requested_rangenum);
if (!numstr) {
ret = NT_STATUS_NO_MEMORY;
goto error;
}
if (dbwrap_exists(db, string_term_tdb_data(numstr))) {
DEBUG(1, ("Requested range already in use.\n"));
if (dbwrap_exists(db, string_term_tdb_data(numstr))) {
DEBUG(1, ("Requested range '%s' is already in use.\n", numstr));
if (requested_rangenum < hwm) {
ret = NT_STATUS_INVALID_PARAMETER;
goto error;
} else {
ret = NT_STATUS_INTERNAL_DB_CORRUPTION;
}
TALLOC_FREE(numstr);
} else {
goto error;
}
if (requested_rangenum >= hwm) {
/*
* requested or automatic range >= HWM:
* increment the HWM.