4 files changed, 12 insertions, 9 deletions

diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index 963e05ff3..7ac60f70c 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -108,7 +108,7 @@ static int have_profile(const char *filename, const char *homedir) {
         return rv;
 }
 
-void fix_desktop_files(char *homedir) {
+void fix_desktop_files(const char *homedir) {
         assert(homedir);
         struct stat sb;
 
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index dac5794b4..2755968c9 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -734,6 +734,7 @@ ripperx
 ristretto
 rocketchat
 rpcs3
+rssguard
 rtorrent
 runenpass.sh
 sayonara
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h
index 825bf8d03..8f74a1198 100644
--- a/src/firecfg/firecfg.h
+++ b/src/firecfg/firecfg.h
@@ -49,6 +49,6 @@ int is_link(const char *fname);
 void sound(void);
 
 // desktop_files.c
-void fix_desktop_files(char *homedir);
+void fix_desktop_files(const char *homedir);
 
 #endif
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index da962c35d..4ec81c5b3 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -288,8 +288,11 @@ static void set_links_homedir(const char *homedir) {
         free(firejail_exec);
 }
 
-static char *get_user(void) {
-        char *user = getenv("SUDO_USER");
+static const char *get_sudo_user(void) {
+        const char *doas_user = getenv("DOAS_USER");
+        const char *sudo_user = getenv("SUDO_USER");
+        const char *user = doas_user ? doas_user : sudo_user;
+
         if (!user) {
                 user = getpwuid(getuid())->pw_name;
                 if (!user) {
@@ -301,13 +304,13 @@ static char *get_user(void) {
         return user;
 }
 
-static char *get_homedir(const char *user, uid_t *uid, gid_t *gid) {
+static const char *get_homedir(const char *user, uid_t *uid, gid_t *gid) {
         // find home directory
         struct passwd *pw = getpwnam(user);
         if (!pw)
                 goto errexit;
 
-        char *home = pw->pw_dir;
+        const char *home = pw->pw_dir;
         if (!home)
                 goto errexit;
 
@@ -326,12 +329,11 @@ int main(int argc, char **argv) {
         int bindir_set = 0;
 
         // user setup
-        char *user = get_user();
+        const char *user = get_sudo_user();
         assert(user);
         uid_t uid;
         gid_t gid;
-        char *home = get_homedir(user, &uid, &gid);
-
+        const char *home = get_homedir(user, &uid, &gid);
 
         // check for --bindir
         for (i = 1; i < argc; i++) {