isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change sudo_strtomode() to return mode_t.

Browse Source
This commit is contained in:
Todd C. Miller
2023-07-05 09:54:22 -06:00
parent 2848dddd87
commit 2d1b3c369f
5 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/util/strtomode.c
View File

@@ -38,8 +38,8 @@
* On success, returns the parsed mode and clears errstr.
* On error, returns 0 and sets errstr.
*/
int
sudo_strtomode_v1(const char *cp, const char **errstr)
mode_t
sudo_strtomode_v2(const char *cp, const char **errstr)
{
char *ep;
long lval;
@@ -51,15 +51,21 @@ sudo_strtomode_v1(const char *cp, const char **errstr)
if (errstr != NULL)
*errstr = N_("invalid value");
errno = EINVAL;
debug_return_int(0);
debug_return_mode_t(0);
}
if (lval < 0 || lval > ACCESSPERMS) {
if (errstr != NULL)
*errstr = lval < 0 ? N_("value too small") : N_("value too large");
errno = ERANGE;
debug_return_int(0);
debug_return_mode_t(0);
}
if (errstr != NULL)
*errstr = NULL;
debug_return_int((int)lval);
debug_return_mode_t((mode_t)lval);
}
int
sudo_strtomode_v1(const char *cp, const char **errstr)
{
return (int)sudo_strtomode_v2(cp, errstr);
}