fix verbosity for non-authorized user

users not in firejail.users should only see the error,
not the symlink warning. Also exposes less code to non-
authorized users.

2 files changed, 15 insertions, 15 deletions

diff --git a/etc/firejail.config b/etc/firejail.config
index 4c0cb2a41..1f80cedee 100644
--- a/etc/firejail.config
+++ b/etc/firejail.config
@@ -2,7 +2,7 @@
 # keyword-argument pairs, one per line. Most features are enabled by default.
 # Use 'yes' or 'no' as configuration values.
 
-# Allow symbolic links in path of user home directories, default disabled.
+# Resolve symbolic links in path of user home directories, default disabled.
 # homedir-symlink no
 
 # Enable AppArmor functionality, default enabled.
diff --git a/src/firejail/main.c b/src/firejail/main.c
index d1c41c58a..f5785ff50 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -302,29 +302,29 @@ static void init_cfg(int argc, char **argv) {
         if (!cfg.username)
                 errExit("strdup");
 
-        // build home directory name
-        if (pw->pw_dir == NULL) {
-                fprintf(stderr, "Error: user %s doesn't have a user directory assigned\n", cfg.username);
+        // check user database
+        if (!firejail_user_check(cfg.username)) {
+                fprintf(stderr, "Error: the user is not allowed to use Firejail.\n"
+                        "Please add the user in %s/firejail.users file,\n"
+                        "either by running \"sudo firecfg\", or by editing the file directly.\n"
+                        "See \"man firejail-users\" for more details.\n\n", SYSCONFDIR);
+
+                // attempt to run the program as is
+                run_symlink(argc, argv, 1);
                 exit(1);
         }
-        build_cfg_homedir(pw->pw_dir);
-        assert(cfg.homedir);
 
         cfg.cwd = getcwd(NULL, 0);
         if (!cfg.cwd && errno != ENOENT)
                 errExit("getcwd");
 
-        // check user database
-        if (!firejail_user_check(cfg.username)) {
-                fprintf(stderr, "Error: the user is not allowed to use Firejail. "
-                        "Please add the user in %s/firejail.users file, "
-                        "either by running \"sudo firecfg\", or by editing the file directly.\n"
-                        "See \"man firejail-users\" for more details.\n", SYSCONFDIR);
-
-                // attempt to run the program as is
-                run_symlink(argc, argv, 1);
+        // build home directory name
+        if (pw->pw_dir == NULL) {
+                fprintf(stderr, "Error: user %s doesn't have a user directory assigned\n", cfg.username);
                 exit(1);
         }
+        build_cfg_homedir(pw->pw_dir);
+        assert(cfg.homedir);
 
         // initialize random number generator
         sandbox_pid = getpid();