sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libcli/security: allow decimal/octal numbers in SDDL access mask

Browse Source 
This follows Windows and [MS-DTYP].

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-03-23 21:28:09 +00:00 committed by Andrew Bartlett
parent 5abd687fce
commit 11add4d631
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libcli/security/sddl.c
View File

@ -23,6 +23,7 @@
#include "lib/util/debug.h"
#include "libcli/security/security.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "lib/util/smb_strtox.h"
#include "system/locale.h"
struct sddl_transition_state {
@ -326,13 +327,24 @@ static bool sddl_decode_access(const char *str, uint32_t *pmask)
{
const char *str0 = str;
uint32_t mask = 0;
int cmp;
cmp = strncmp(str, "0x", 2);
if (cmp == 0) {
*pmask = strtol(str, NULL, 16);
unsigned long long numeric_mask;
int err;
/*
* The access mask can be a number or a series of flags.
*
* Canonically the number is expressed in hexadecimal (with 0x), but
* per MS-DTYP and Windows behaviour, octal and decimal numbers are
* also accepted.
*
* Windows will truncate overflowing numbers at 0xffffffff,
* while we will wrap around, using only the lower 32 bits.
*/
numeric_mask = smb_strtoull(str, NULL, 0, &err, SMB_STR_STANDARD);
if (err == 0) {
*pmask = numeric_mask;
return true;
}
/* It's not a number, so we'll look for flags */
while ((str[0] != '\0') && isupper(str[0])) {
uint32_t flags = 0;