cleanup unfinished features

3 files changed, 0 insertions, 79 deletions

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 532a4797e..ce2b0e7a5 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -136,8 +136,6 @@ extern int arg_rlimit_nofile;	// rlimit nofile
 extern int arg_rlimit_nproc;    // rlimit nproc
 extern int arg_rlimit_fsize;    // rlimit fsize
 extern int arg_rlimit_sigpending;// rlimit sigpending
-extern int arg_nox11;           // kill the program if x11 unix domain socket is accessed
-extern int arg_nodbus;          // kill the program if D-Bus is accessed
 extern int arg_nogroups;        // disable supplementary groups
 extern int arg_noroot;          // create a new user namespace and disable root user
 extern int arg_netfilter;       // enable netfilter
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index ca73ae554..3f8f7176c 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -377,49 +377,6 @@ void fs_proc_sys_dev_boot(void) {
 //      if (mount("sysfs", "/sys", "sysfs", MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REC, NULL) < 0)
 //              errExit("mounting /sys");
 
-
-        // mounting firejail kernel module files
-        if (stat("/proc/firejail-uptime", &s) == 0) {
-                errno = 0;
-                FILE *fp = fopen("/proc/firejail", "w");
-                int cnt = 0;
-                while (errno == EBUSY && cnt < 10) {
-                        if (!fp) {
-                                int s = random();
-                                s /= 200000;
-                                usleep(s);
-                                fp = fopen("/proc/firejail", "w");
-                        }
-                        else
-                                break;
-                }
-                if (!fp) {
-                        fprintf(stderr, "Error: cannot register sandbox with firejail-lkm\n");
-                        exit(1);
-                }       
-                if (fp) {
-                        // registration
-                        fprintf(fp, "register\n");
-                        fflush(0);
-                        // filtering x11 connect calls
-                        if (arg_nox11) {
-                                fprintf(fp, "no connect unix /tmp/.X11\n");
-                                fflush(0);
-                                printf("X11 access disabled\n");
-                        }
-                        if (arg_nodbus) {
-                                fprintf(fp, "no connect unix /var/run/dbus/system_bus_socket\n");
-                                fflush(0);
-                                fprintf(fp, "no connect unix /tmp/dbus\n");
-                                fflush(0);
-                                printf("D-Bus access disabled\n");
-                        }
-                        fclose(fp);
-                        if (mount("/proc/firejail-uptime", "/proc/uptime", NULL, MS_BIND|MS_REC, NULL) < 0)
-                                fprintf(stderr, "Warning: cannot mount /proc/firejail-uptime\n");
-                }
-        }
-
         // Disable SysRq
         // a linux box can be shut down easily using the following commands (as root):
         // # echo 1 > /proc/sys/kernel/sysrq
diff --git a/src/firejail/main.c b/src/firejail/main.c
index bcff0e41f..3a5a21cad 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -73,8 +73,6 @@ int arg_rlimit_nofile = 0;			// rlimit nofile
 int arg_rlimit_nproc = 0;                       // rlimit nproc
 int arg_rlimit_fsize = 0;                               // rlimit fsize
 int arg_rlimit_sigpending = 0;                  // rlimit fsize
-int arg_nox11 = 0;                              // kill the program if x11 unix domain socket is accessed
-int arg_nodbus = 0;                             // kill the program if D-Bus is accessed
 int arg_nogroups = 0;                           // disable supplementary groups
 int arg_noroot = 0;                             // create a new user namespace and disable root user
 int arg_netfilter;                              // enable netfilter
@@ -99,18 +97,6 @@ static void myexit(int rv) {
         if (!arg_command)
                 printf("\nparent is shutting down, bye...\n");
         
-        struct stat s;
-        if (stat("/proc/firejail", &s) == 0) {
-                /* coverity[toctou] */
-                FILE *fp = fopen("/proc/firejail", "w");
-                if (fp) {
-                        // deregistration
-                        fprintf(fp, "release\n");
-                        fflush(0);
-                        fclose(fp);
-                }
-        }
-
         // delete sandbox files in shared memory
         bandwidth_shm_del_file(sandbox_pid);            // bandwidht file
         network_shm_del_file(sandbox_pid);              // network map file
@@ -556,26 +542,6 @@ int main(int argc, char **argv) {
                         arg_ipc = 1;
                 else if (strncmp(argv[i], "--cpu=", 6) == 0)
                         read_cpu_list(argv[i] + 6);
-                else if (strcmp(argv[i], "--nox11") == 0) {
-                        // check if firejail lkm is present
-                        struct stat s;
-                        if (stat("/proc/firejail", &s) < 0) {
-                                fprintf(stderr, "Error: firejail Linux kernel module not found. The module"
-                                        " is required for --nox11 option to work.\n");
-                                exit(1);
-                        }
-                        arg_nox11 = 1;
-                }
-                else if (strcmp(argv[i], "--nodbus") == 0) {
-                        // check if firejail lkm is present
-                        struct stat s;
-                        if (stat("/proc/firejail", &s) < 0) {
-                                fprintf(stderr, "Error: firejail Linux kernel module not found. The module"
-                                        " is required for --nodbus option to work.\n");
-                                exit(1);
-                        }
-                        arg_nodbus = 1;
-                }
                 else if (strncmp(argv[i], "--cgroup=", 9) == 0) {
                         if (arg_cgroup) {
                                 fprintf(stderr, "Error: only a cgroup can be defined\n");