2 files changed, 38 insertions, 8 deletions

diff --git a/etc/midori.profile b/etc/midori.profile
index 44e5e7417..a0bcb808c 100644
--- a/etc/midori.profile
+++ b/etc/midori.profile
@@ -2,16 +2,46 @@
 # Persistent customizations should go in a .local file.
 include /etc/firejail/midori.local
 
-# Midori browser profile
-noblacklist ${HOME}/.config/midori
+# Midori profile
+noblacklist ~/.config/midori
+noblacklist ~/.local/share/midori
+noblacklist ~/.local/share/webkit
+noblacklist ~/.local/share/webkitgtk
+noblacklist ~/.pki
+noblacklist ~/.lastpass
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
 
+mkdir ~/.config/midori
+whitelist ~/.config/midori
+
+mkdir ~/.cache/midori
+whitelist ~/.cache/midori
+
+mkdir ~/.local/share/midori
+whitelist ~/.local/share/midori
+
+mkdir ~/.local/share/webkit
+whitelist ~/.local/share/webkit
+
+mkdir ~/.local/share/webkitgtk
+whitelist ~/.local/share/webkitgtk
+
+whitelist ${DOWNLOADS}
+whitelist ~/.config/gnome-mplayer
+whitelist ~/.cache/gnome-mplayer/plugin
+mkdir ~/.pki
+whitelist ~/.pki
+whitelist ~/.lastpass
+
+
 caps.drop all
 netfilter
 nonewprivs
-# noroot - noroot break midori on Ubuntu 14.04
-protocol unix,inet,inet6
+# noroot - porblems on Ubuntu 14.04
+protocol unix,inet,inet6,netlink
 seccomp
+tracelog
+
 
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c
index 5e30e56a3..bf63bae38 100644
--- a/src/firejail/rlimit.c
+++ b/src/firejail/rlimit.c
@@ -33,7 +33,7 @@ void set_rlimits(void) {
                 if (setrlimit(RLIMIT_NOFILE, &rl) == -1)
                         errExit("setrlimit");
                 if (arg_debug)
-                        printf("Config rlimit: number of open file descriptors %u\n", cfg.rlimit_nofile);
+                        printf("Config rlimit: number of open file descriptors %llu\n", cfg.rlimit_nofile);
         }
 
         if (arg_rlimit_nproc) {
@@ -45,7 +45,7 @@ void set_rlimits(void) {
                 if (setrlimit(RLIMIT_NPROC, &rl) == -1)
                         errExit("setrlimit");
                 if (arg_debug)
-                        printf("Config rlimit: number of processes %u\n", cfg.rlimit_nproc);
+                        printf("Config rlimit: number of processes %llu\n", cfg.rlimit_nproc);
         }
         
         if (arg_rlimit_fsize) {
@@ -57,7 +57,7 @@ void set_rlimits(void) {
                 if (setrlimit(RLIMIT_FSIZE, &rl) == -1)
                         errExit("setrlimit");
                 if (arg_debug)
-                        printf("Config rlimit: maximum file size %u\n", cfg.rlimit_fsize);
+                        printf("Config rlimit: maximum file size %llu\n", cfg.rlimit_fsize);
         }
         
         if (arg_rlimit_sigpending) {
@@ -69,6 +69,6 @@ void set_rlimits(void) {
                 if (setrlimit(RLIMIT_SIGPENDING, &rl) == -1)
                         errExit("setrlimit");
                 if (arg_debug)
-                        printf("Config rlimit: maximum number of signals pending %u\n", cfg.rlimit_sigpending);
+                        printf("Config rlimit: maximum number of signals pending %llu\n", cfg.rlimit_sigpending);
         }
 }