From b65dfff0f3b7ff5a16771ac4eca80d0609cbbf44 Mon Sep 17 00:00:00 2001
From: startx2017 <vradu.startx@yandex.com>
Date: Tue, 19 Jun 2018 09:24:48 -0400
Subject: merge from LTS branch: cleanup O_PATH, --private-template

---
 src/firejail/firejail.h   | 6 ------
 src/firejail/fs.c         | 5 -----
 src/firejail/main.c       | 1 -
 src/firejail/pulseaudio.c | 6 ------
 src/firejail/util.c       | 5 -----
 5 files changed, 23 deletions(-)

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 92a18af25..6ee7d9b14 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -227,7 +227,6 @@ typedef struct config_t {
 	char *lib_private_keep;	// keep list for private bin directory
 	char *cwd;		// current working directory
 	char *overlay_dir;
-	char *private_template; // template dir for tmpfs home
 
 	// networking
 	char *name;		// sandbox name
@@ -307,7 +306,6 @@ static inline int any_interface_configured(void) {
 }
 
 extern int arg_private;		// mount private /home
-extern int arg_private_template; // private /home template
 extern int arg_private_cache;	// private home/.cache
 extern int arg_debug;		// print debug messages
 extern int arg_debug_blacklists;	// print debug messages for blacklists
@@ -567,12 +565,8 @@ void fs_dev_disable_u2f(void);
 void fs_private(void);
 // private mode (--private=homedir)
 void fs_private_homedir(void);
-// private template (--private-template=templatedir)
-void fs_private_template(void);
 // check new private home directory (--private= option) - exit if it fails
 void fs_check_private_dir(void);
-// check new private template home directory (--private-template= option) exit if it fails
-void fs_check_private_template(void);
 void fs_private_home_list(void);
 
 
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 0e104699f..24ff553d7 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -27,12 +27,7 @@
 #include <glob.h>
 #include <dirent.h>
 #include <errno.h>
-
-// on Debian 7 we are missing O_PATH definition
 #include <fcntl.h>
-#ifndef O_PATH
-#define O_PATH		010000000
-#endif
 
 // check noblacklist statements not matched by a proper blacklist in disable-*.inc files
 //#define TEST_NO_BLACKLIST_MATCHING
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 6aebd9ab2..50b2da7b9 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -45,7 +45,6 @@ gid_t firejail_gid = 0;
 static char child_stack[STACK_SIZE];		// space for child's stack
 Config cfg;					// configuration
 int arg_private = 0;				// mount private /home and /tmp directoryu
-int arg_private_template = 0; 	// mount private /home using a template
 int arg_private_cache = 0;		// mount private home/.cache
 int arg_debug = 0;				// print debug messages
 int arg_debug_blacklists = 0;			// print debug messages for blacklists
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index e39f6f50c..521f144e8 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -23,13 +23,7 @@
 #include <sys/mount.h>
 #include <dirent.h>
 #include <sys/wait.h>
-
-// on Debian 7 we are missing O_PATH definition
 #include <fcntl.h>
-#ifndef O_PATH
-#define O_PATH		010000000
-#endif
-
 
 // disable pulseaudio socket
 void pulseaudio_disable(void) {
diff --git a/src/firejail/util.c b/src/firejail/util.c
index f6233359a..eb59e36be 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -29,12 +29,7 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <sys/wait.h>
-
-// on Debian 7 we are missing O_PATH definition
 #include <fcntl.h>
-#ifndef O_PATH
-#define O_PATH		010000000
-#endif
 
 #define MAX_GROUPS 1024
 
-- 
cgit v1.2.3-70-g09d2