aboutsummaryrefslogtreecommitdiffstats
path: root/src/jailcheck
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-07-14 04:23:58 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-07-14 09:23:28 -0300
commite7225b64469b6ada187764ee9f663ad1039f20b0 (patch)
tree01984da6c5507cc42788625b90882b11fc5c2511 /src/jailcheck
parentfirecfg: add const to a few functions/variables (diff)
downloadfirejail-e7225b64469b6ada187764ee9f663ad1039f20b0.tar.gz
firejail-e7225b64469b6ada187764ee9f663ad1039f20b0.tar.zst
firejail-e7225b64469b6ada187764ee9f663ad1039f20b0.zip
feature: add doas support in firecfg and jailcheck
Closes #5899. Suggested-by: @shaggonit
Diffstat (limited to 'src/jailcheck')
-rw-r--r--src/jailcheck/main.c2
-rw-r--r--src/jailcheck/utils.c5
2 files changed, 5 insertions, 2 deletions
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) {
86 86
87 // user setup 87 // user setup
88 if (getuid() != 0) { 88 if (getuid() != 0) {
89 fprintf(stderr, "Error: you need to be root (via sudo) to run this program\n"); 89 fprintf(stderr, "Error: you need to be root (via sudo or doas) to run this program\n");
90 exit(1); 90 exit(1);
91 } 91 }
92 user_name = get_sudo_user(); 92 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 @@
26#define BUFLEN 4096 26#define BUFLEN 4096
27 27
28char *get_sudo_user(void) { 28char *get_sudo_user(void) {
29 char *user = getenv("SUDO_USER"); 29 char *doas_user = getenv("DOAS_USER");
30 char *sudo_user = getenv("SUDO_USER");
31 char *user = doas_user ? doas_user : sudo_user;
32
30 if (!user) { 33 if (!user) {
31 user = getpwuid(getuid())->pw_name; 34 user = getpwuid(getuid())->pw_name;
32 if (!user) { 35 if (!user) {