From e7225b64469b6ada187764ee9f663ad1039f20b0 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 14 Jul 2023 04:23:58 -0300 Subject: feature: add doas support in firecfg and jailcheck Closes #5899. Suggested-by: @shaggonit --- src/jailcheck/main.c | 2 +- src/jailcheck/utils.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/jailcheck') diff --git a/src/jailcheck/main.c b/src/jailcheck/main.c index 93d334c7a..6cc5cf904 100644 --- a/src/jailcheck/main.c +++ b/src/jailcheck/main.c @@ -86,7 +86,7 @@ int main(int argc, char **argv) { // user setup if (getuid() != 0) { - fprintf(stderr, "Error: you need to be root (via sudo) to run this program\n"); + fprintf(stderr, "Error: you need to be root (via sudo or doas) to run this program\n"); exit(1); } user_name = get_sudo_user(); diff --git a/src/jailcheck/utils.c b/src/jailcheck/utils.c index 97fe8833b..930820604 100644 --- a/src/jailcheck/utils.c +++ b/src/jailcheck/utils.c @@ -26,7 +26,10 @@ #define BUFLEN 4096 char *get_sudo_user(void) { - char *user = getenv("SUDO_USER"); + char *doas_user = getenv("DOAS_USER"); + char *sudo_user = getenv("SUDO_USER"); + char *user = doas_user ? doas_user : sudo_user; + if (!user) { user = getpwuid(getuid())->pw_name; if (!user) { -- cgit v1.2.3-54-g00ecf