Merge branch 'master' of ssh://github.com/netblue30/firejail

2 files changed, 6 insertions, 2 deletions

diff --git a/src/jailcheck/main.c b/src/jailcheck/main.c
index 27da309ea..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();
@@ -120,6 +120,7 @@ int main(int argc, char **argv) {
         // basic sysfiles
         sysfiles_setup("/etc/shadow");
         sysfiles_setup("/etc/gshadow");
+        sysfiles_setup("/usr/bin/doas");
         sysfiles_setup("/usr/bin/mount");
         sysfiles_setup("/usr/bin/su");
         sysfiles_setup("/usr/bin/ksu");
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) {