diff options
| author | Swen Schillig <swen@linux.ibm.com> | 2019-06-04 09:04:15 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2019-06-30 11:32:18 +0000 |
| commit | a75727f191c53ca358cdef930b75d169793f59a3 (patch) | |
| tree | 86c58f95cad32a1a72f32a7eb328a35704d3126f /source3/groupdb | |
| parent | bf020a8c8db6bb6a0386d3bf69d40116601b1aca (diff) | |
| download | samba-a75727f191c53ca358cdef930b75d169793f59a3.tar.gz | |
source3: Update all consumers of strtoul_err(), strtoull_err() to new API
Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
Diffstat (limited to 'source3/groupdb')
| -rw-r--r-- | source3/groupdb/mapping.c | 5 | ||||
| -rw-r--r-- | source3/groupdb/mapping_tdb.c | 21 |
2 files changed, 16 insertions, 10 deletions
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index 77eb0d6e5cd..1e25c5637dc 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -245,10 +245,11 @@ int smb_create_group(const char *unix_group, gid_t *new_gid) nread = read(fd, output, sizeof(output)-1); if (nread > 0) { output[nread] = '\0'; - *new_gid = (gid_t)strtoul_err(output, + *new_gid = (gid_t)smb_strtoul(output, NULL, 10, - &error); + &error, + SMB_STR_STANDARD); if (error != 0) { *new_gid = 0; close(fd); diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index c80ff1f859a..b7ff724ba05 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/source3/groupdb/mapping_tdb.c @@ -857,7 +857,6 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key, size_t len; char *name; char *val; - char *q; uint32_t num_mem = 0; struct dom_sid *members = NULL; int error = 0; @@ -975,8 +974,12 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key, /* we ignore unknown or uninteresting attributes * (objectclass, etc.) */ if (strcasecmp_m(name, "gidNumber") == 0) { - map->gid = strtoul_err(val, &q, 10, &error); - if (*q || (error != 0)) { + map->gid = smb_strtoul(val, + NULL, + 10, + &error, + SMB_STR_FULL_STR_CONV); + if (error != 0) { errno = EIO; goto failed; } @@ -986,11 +989,13 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key, goto failed; } } else if (strcasecmp_m(name, "sidNameUse") == 0) { - map->sid_name_use = strtoul_err(val, - &q, - 10, - &error); - if (*q || (error != 0)) { + map->sid_name_use = + smb_strtoul(val, + NULL, + 10, + &error, + SMB_STR_FULL_STR_CONV); + if (error != 0) { errno = EIO; goto failed; } |