11 files changed, 2 insertions, 174 deletions

diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c
index 512cc0b05..5e9002f22 100644
--- a/src/firejail/bandwidth.c
+++ b/src/firejail/bandwidth.c
@@ -311,21 +311,6 @@ void bandwidth_set(pid_t pid, const char *dev, int down, int up) {
 //***********************************
 // command execution
 //***********************************
-void bandwidth_name(const char *name, const char *command, const char *dev, int down, int up) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        bandwidth_pid(pid, command, dev, down, up);
-}
-
 void bandwidth_pid(pid_t pid, const char *command, const char *dev, int down, int up) {
         EUID_ASSERT();
         //************************
diff --git a/src/firejail/caps.c b/src/firejail/caps.c
index 2d42c7d8a..3fd8b576e 100644
--- a/src/firejail/caps.c
+++ b/src/firejail/caps.c
@@ -401,22 +401,6 @@ static uint64_t extract_caps(int pid) {
         exit(1);
 }
 
-
-void caps_print_filter_name(const char *name) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        caps_print_filter(pid);
-}
-
 void caps_print_filter(pid_t pid) {
         EUID_ASSERT();
         
diff --git a/src/firejail/cpu.c b/src/firejail/cpu.c
index cfb03e5fc..7f53fed0f 100644
--- a/src/firejail/cpu.c
+++ b/src/firejail/cpu.c
@@ -168,21 +168,6 @@ static void print_cpu(int pid) {
         free(file);
 }
 
-void cpu_print_filter_name(const char *name) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        cpu_print_filter(pid);
-}
-
 void cpu_print_filter(pid_t pid) {
         EUID_ASSERT();
         
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index b8126cfe7..435405fd9 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -356,7 +356,6 @@ void net_configure_bridge(Bridge *br, char *dev_name);
 void net_configure_sandbox_ip(Bridge *br);
 void net_configure_veth_pair(Bridge *br, const char *ifname, pid_t child);
 void net_check_cfg(void);
-void net_dns_print_name(const char *name);
 void net_dns_print(pid_t pid);
 void network_main(pid_t child);
 
@@ -420,9 +419,9 @@ void usage(void);
 
 // join.c
 void join(pid_t pid, int argc, char **argv, int index);
-void join_name(const char *name, int argc, char **argv, int index);
+
+// shutdown.c
 void shut(pid_t pid);
-void shut_name(const char *name);
 
 // restricted_shell.c
 int restricted_shell(const char *user);
@@ -501,7 +500,6 @@ void seccomp_filter_32(void);
 void seccomp_filter_64(void);
 int seccomp_filter_drop(int enforce_seccomp);
 int seccomp_filter_keep(void);
-void seccomp_print_filter_name(const char *name);
 void seccomp_print_filter(pid_t pid);
 
 // caps.c
@@ -513,7 +511,6 @@ int caps_check_list(const char *clist, void (*callback)(int));
 void caps_drop_list(const char *clist);
 void caps_keep_list(const char *clist);
 void caps_print_filter(pid_t pid);
-void caps_print_filter_name(const char *name);
 
 // syscall.c
 const char *syscall_find_nr(int nr);
@@ -536,7 +533,6 @@ void read_cpu_list(const char *str);
 void set_cpu_affinity(void);
 void load_cpu(const char *fname);
 void save_cpu(void);
-void cpu_print_filter_name(const char *name);
 void cpu_print_filter(pid_t pid);
 
 // cgroup.c
@@ -554,7 +550,6 @@ void netfilter6(const char *fname);
 
 // bandwidth.c
 void bandwidth_del_run_file(pid_t pid);
-void bandwidth_name(const char *name, const char *command, const char *dev, int down, int up);
 void bandwidth_pid(pid_t pid, const char *command, const char *dev, int down, int up);
 void network_del_run_file(pid_t pid);
 void network_set_run_file(pid_t pid);
@@ -599,7 +594,6 @@ void fs_private_bin_list(void);
 // protocol.c
 void protocol_filter_save(void);
 void protocol_filter_load(const char *fname);
-void protocol_print_filter_name(const char *name);
 void protocol_print_filter(pid_t pid);
 
 // restrict_users.c
@@ -612,7 +606,6 @@ void fs_logger2int(const char *msg1, int d);
 void fs_logger3(const char *msg1, const char *msg2, const char *msg3);
 void fs_logger_print(void);
 void fs_logger_change_owner(void);
-void fs_logger_print_log_name(const char *name);
 void fs_logger_print_log(pid_t pid);
 
 // run_symlink.c
@@ -641,7 +634,6 @@ enum {
         SANDBOX_FS_PUT,
         SANDBOX_FS_MAX // this should always be the last entry
 };
-void sandboxfs_name(int op, const char *name, const char *path1, const char *path2);
 void sandboxfs(int op, pid_t pid, const char *path1, const char *path2);
 
 // checkcfg.c
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c
index 9f33b36d9..052a41457 100644
--- a/src/firejail/fs_logger.c
+++ b/src/firejail/fs_logger.c
@@ -117,22 +117,6 @@ void fs_logger_change_owner(void) {
                 errExit("chown");
 }
 
-void fs_logger_print_log_name(const char *name) {
-        EUID_ASSERT();
-        
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        fs_logger_print_log(pid);
-}
-
 void fs_logger_print_log(pid_t pid) {
         EUID_ASSERT();
 
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 6f1e9455c..899166447 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -173,21 +173,6 @@ static void extract_user_namespace(pid_t pid) {
         free(uidmap);
 }
 
-void join_name(const char *name, int argc, char **argv, int index) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-        join(pid, argc, argv, index);
-}
-
 void join(pid_t pid, int argc, char **argv, int index) {
         EUID_ASSERT();
         char *homedir = cfg.homedir;
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 1b759d7a1..86c3a6079 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -185,22 +185,6 @@ static void print_directory(const char *path) {
         free(namelist);
 }
 
-void sandboxfs_name(int op, const char *name, const char *path1, const char *path2) {
-        EUID_ASSERT();
-        
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        sandboxfs(op, pid, path1, path2);
-}
-
 char *expand_path(const char *path) {
         char *fname = NULL;
         if (*path == '/') {
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index 8a9c47f0e..9fbc09d2b 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -231,23 +231,6 @@ void net_check_cfg(void) {
         }
 }
 
-
-
-void net_dns_print_name(const char *name) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        net_dns_print(pid);
-}
-
 #define MAXBUF 4096
 void net_dns_print(pid_t pid) {
         EUID_ASSERT();
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
index e8e88aee9..2a09ed010 100644
--- a/src/firejail/protocol.c
+++ b/src/firejail/protocol.c
@@ -59,29 +59,6 @@ void protocol_filter_load(const char *fname) {
 
 
 // --protocol.print
-void protocol_print_filter_name(const char *name) {
-        EUID_ASSERT();
-        
-        (void) name;
-#ifdef SYS_socket
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        protocol_print_filter(pid);
-#else
-        fprintf(stderr, "Warning: --protocol not supported on this platform\n");
-        return;
-#endif
-}
-
-// --protocol.print
 void protocol_print_filter(pid_t pid) {
         EUID_ASSERT();
         
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c
index 20807f5b1..4a2221e98 100644
--- a/src/firejail/seccomp.c
+++ b/src/firejail/seccomp.c
@@ -232,21 +232,6 @@ int seccomp_filter_keep(void) {
         return seccomp_load(RUN_SECCOMP_CFG);
 }
 
-void seccomp_print_filter_name(const char *name) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        seccomp_print_filter(pid);
-}
-
 void seccomp_print_filter(pid_t pid) {
         EUID_ASSERT();
 
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c
index 8d8035bfb..c23e87321 100644
--- a/src/firejail/shutdown.c
+++ b/src/firejail/shutdown.c
@@ -23,22 +23,6 @@
 #include <fcntl.h>
 #include <sys/prctl.h>
 
-void shut_name(const char *name) {
-        EUID_ASSERT();
-        if (!name || strlen(name) == 0) {
-                fprintf(stderr, "Error: invalid sandbox name\n");
-                exit(1);
-        }
-        
-        pid_t pid;
-        if (name2pid(name, &pid)) {
-                fprintf(stderr, "Error: cannot find sandbox %s\n", name);
-                exit(1);
-        }
-
-        shut(pid);
-}
-
 void shut(pid_t pid) {
         EUID_ASSERT();