testing 0.9.42~rc2

6 files changed, 35 insertions, 19 deletions

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index a3b573acc..755ed4979 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -81,19 +81,23 @@
                 assert(file);\
                 struct stat s;\
                 if (stat(file, &s) == -1) errExit("stat");\
-                assert(s.st_uid == uid && s.st_gid == gid && (s.st_mode & 07777) == mode);\
+                assert(s.st_uid == uid);\
+                assert(s.st_gid == gid);\
+                assert((s.st_mode & 07777) == (mode));\
         } while (0)
 #define ASSERT_PERMS_FD(fd, uid, gid, mode) \
         do { \
                 struct stat s;\
                 if (stat(fd, &s) == -1) errExit("stat");\
-                assert(s.st_uid == uid && s.st_gid == gid && (s.st_mode & 07777) == mode);\
+                assert(s.st_uid == uid);\
+                assert(s.st_gid == gid);\
+                assert((s.st_mode & 07777) == (mode));\
         } while (0)
 #define ASSERT_PERMS_STREAM(file, uid, gid, mode) \
         do { \
                 int fd = fileno(file);\
                 if (fd == -1) errExit("fileno");\
-                ASSERT_PERMS_FD(fd, uid, gid, mode);\
+                ASSERT_PERMS_FD(fd, uid, gid, (mode));\
         } while (0)
 
 // main.c
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 27e2a7f1a..2181a274b 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1561,17 +1561,21 @@ int main(int argc, char **argv) {
                         arg_writable_var = 1;
                 }
                 else if (strcmp(argv[i], "--private") == 0) {
+#if 0 
          if (arg_private_template) {
             fprintf(stderr, "Error: --private and --private-template are mutually exclusive\n");
             exit(1);
          }
+#endif
                         arg_private = 1;
-      }
+                }
                 else if (strncmp(argv[i], "--private=", 10) == 0) {
+#if 0 
          if (arg_private_template) {
             fprintf(stderr, "Error: --private and --private-template are mutually exclusive\n");
             exit(1);
          }
+#endif
                         // extract private home dirname
                         cfg.home_private = argv[i] + 10;
                         if (*cfg.home_private == '\0') {
@@ -1581,6 +1585,7 @@ int main(int argc, char **argv) {
                         fs_check_private_dir();
                         arg_private = 1;
                 }
+#if 0           
       else if (strncmp(argv[i], "--private-template=", 19) == 0) {
          cfg.private_template = argv[i] + 19;
          if (arg_private) {
@@ -1594,6 +1599,7 @@ int main(int argc, char **argv) {
          fs_check_private_template();
          arg_private_template = 1;
       }
+#endif
                 else if (strcmp(argv[i], "--private-dev") == 0) {
                         arg_private_dev = 1;
                 }
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 916e39892..ee5d8c159 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -630,7 +630,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 return 0;
         }
         
-
+#if 0
    if (strncmp(ptr, "private-template ", 17) == 0) {
       if (arg_private) {
          fprintf(stderr, "Error: --private and --private-template are mutually exclusive\n");
@@ -642,6 +642,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 
       return 0;
    }
+#endif   
         // private /etc list of files and directories
         if (strncmp(ptr, "private-etc ", 12) == 0) {
                 if (arg_writable_etc) {
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 40df00a98..5f845fbd3 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -544,9 +544,11 @@ int sandbox(void* sandbox_arg) {
                 else // --private
                         fs_private();
         }
-        
+
+#if 0   
    if (arg_private_template) 
       fs_private_template();
+#endif
 
         if (arg_private_dev) {
                 if (cfg.chrootdir)
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index d4eab7802..363f973e8 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -221,10 +221,25 @@ $ firejail \-\-overlay-path=~/jails/jail1 firefox
         printf("\tfilesystems. All modifications are discarded when the sandbox is\n");
         printf("\tclosed.\n\n");
         printf("    --private=directory - use directory as user home.\n\n");
-
+#if 0
    printf("    --private-template=directory - same as --private but copy the\n");
    printf("\ttemplatedirectory in the tmpfs mounted user home.\n\n");
 
+.TP
+\fB\-\-private-template=templatedir
+Mount new /root and /home/user directories in temporary
+filesystems, and copy all files in templatedir. All modifications are discarded when the sandbox is
+closed.
+.br
+
+.br
+Example:
+.br
+$ firejail \-\-private-template=/home/netblue/.config/mozilla firefox
+#endif
+
+
+
         printf("    --private-bin=file,file - build a new /bin in a temporary filesystem,\n");
         printf("\tand copy the programs in the list.\n\n");
 
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 19fca9854..434c29c0f 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1086,18 +1086,6 @@ Example:
 $ firejail \-\-private=/home/netblue/firefox-home firefox
 
 .TP
-\fB\-\-private-template=templatedir
-Mount new /root and /home/user directories in temporary
-filesystems, and copy all files in templatedir. All modifications are discarded when the sandbox is
-closed.
-.br
-
-.br
-Example:
-.br
-$ firejail \-\-private-template=/home/netblue/.config/mozilla firefox
-
-.TP
 \fB\-\-private-bin=file,file
 Build a new /bin in a temporary filesystem, and copy the programs in the list.
 If no listed file is found, /bin directory will be empty.