aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2018-09-17 14:57:19 +0200
committerLibravatar smitsohu <smitsohu@gmail.com>2018-09-17 14:57:19 +0200
commit46ba61983f4cfae54a6e87aab761c728804a4e46 (patch)
treeb08931aee849de892b89029692611d68816b162a
parentfix --bandwidth, --cpu.print (diff)
downloadfirejail-46ba61983f4cfae54a6e87aab761c728804a4e46.tar.gz
firejail-46ba61983f4cfae54a6e87aab761c728804a4e46.tar.zst
firejail-46ba61983f4cfae54a6e87aab761c728804a4e46.zip
error strings
-rw-r--r--src/firejail/fs.c8
-rw-r--r--src/firejail/fs_home.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 707817b1c..83830cff6 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -793,13 +793,13 @@ char *fs_check_overlay_dir(const char *subdirname, int allow_reuse) {
793 if (lstat(dirname, &s) == 0) { 793 if (lstat(dirname, &s) == 0) {
794 if (!S_ISDIR(s.st_mode)) { 794 if (!S_ISDIR(s.st_mode)) {
795 if (S_ISLNK(s.st_mode)) 795 if (S_ISLNK(s.st_mode))
796 fprintf(stderr, "Error: ~/.firejail is a symbolic link\n"); 796 fprintf(stderr, "Error: %s is a symbolic link\n", dirname);
797 else 797 else
798 fprintf(stderr, "Error: ~/.firejail is not a directory\n"); 798 fprintf(stderr, "Error: %s is not a directory\n", dirname);
799 exit(1); 799 exit(1);
800 } 800 }
801 if (s.st_uid != getuid()) { 801 if (s.st_uid != getuid()) {
802 fprintf(stderr, "Error: ~/.firejail directory is not owned by the current user\n"); 802 fprintf(stderr, "Error: %s is not owned by the current user\n", dirname);
803 exit(1); 803 exit(1);
804 } 804 }
805 } 805 }
@@ -1160,7 +1160,7 @@ void fs_check_chroot_dir(const char *rootdir) {
1160 if (asprintf(&overlay, "%s/.firejail", cfg.homedir) == -1) 1160 if (asprintf(&overlay, "%s/.firejail", cfg.homedir) == -1)
1161 errExit("asprintf"); 1161 errExit("asprintf");
1162 if (strncmp(rootdir, overlay, strlen(overlay)) == 0) { 1162 if (strncmp(rootdir, overlay, strlen(overlay)) == 0) {
1163 fprintf(stderr, "Error: invalid chroot directory: no directories in ~/.firejail are allowed\n"); 1163 fprintf(stderr, "Error: invalid chroot directory: no directories in %s are allowed\n", overlay);
1164 exit(1); 1164 exit(1);
1165 } 1165 }
1166 free(overlay); 1166 free(overlay);
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index bcfc8a38a..42c67452c 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -248,7 +248,7 @@ void fs_private_homedir(void) {
248 exit(1); 248 exit(1);
249 } 249 }
250 if ((S_IRWXU & s.st_mode) != S_IRWXU) 250 if ((S_IRWXU & s.st_mode) != S_IRWXU)
251 fwarning("no full permissions for private directory\n"); 251 fwarning("no full permissions on private directory\n");
252 // mount via the link in /proc/self/fd 252 // mount via the link in /proc/self/fd
253 char *proc; 253 char *proc;
254 if (asprintf(&proc, "/proc/self/fd/%d", fd) == -1) 254 if (asprintf(&proc, "/proc/self/fd/%d", fd) == -1)