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

Add a sudoers_context struct that embeds the user and runas structs.

Browse Source
This commit is contained in:
Todd C. Miller
2023-08-20 16:27:08 -06:00
parent 1b9fb405a3
commit 2d2529a15e
36 changed files with 920 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/sudoers/toke.c
View File

@@ -5894,7 +5894,7 @@ init_lexer(void)
}
/*
* Like strlcpy() but expand %h escapes to user_ctx.shost.
* Like strlcpy() but expand %h escapes to ctx.user.shost.
*/
static size_t
strlcpy_expand_host(char *dst, const char *src, size_t size)
@@ -5905,7 +5905,7 @@ strlcpy_expand_host(char *dst, const char *src, size_t size)
while ((ch = *src++) != '\0') {
if (ch == '%' && *src == 'h') {
size_t n = strlcpy(dst, user_ctx.shost, size);
size_t n = strlcpy(dst, ctx.user.shost, size);
len += n;
if (n >= size) {
/* truncated */
@@ -5967,7 +5967,7 @@ expand_include(const char *src)
if (*src == '/') {
/* Fully-qualified path, make a copy and expand %h escapes. */
dst_size = src_len + (nhost * strlen(user_ctx.shost)) - (nhost * 2) + 1;
dst_size = src_len + (nhost * strlen(ctx.user.shost)) - (nhost * 2) + 1;
dst0 = sudo_rcstr_alloc(dst_size - 1);
if (dst0 == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
@@ -5992,7 +5992,7 @@ expand_include(const char *src)
dst_size += (size_t)(dirend - cp) + 1;
}
/* Includes space for ':' separator and NUL terminator. */
dst_size += src_len + (nhost * strlen(user_ctx.shost)) - (nhost * 2) + 1;
dst_size += src_len + (nhost * strlen(ctx.user.shost)) - (nhost * 2) + 1;
}
/* Make a copy of the fully-qualified path and return it. */