5 files changed, 16 insertions, 13 deletions

diff --git a/README b/README
index f1b41bcf3..b12ad7b59 100644
--- a/README
+++ b/README
@@ -111,6 +111,7 @@ Zack Weinberg (https://github.com/zackw)
         - rework X11 display number assignment
         - rework X11 xorg processing
         - rework fcopy, --follow-link support in fcopy
+        - follow link support in --private-bin
 Igor Bukanov (https://github.com/ibukanov)
         - found/fiixed privilege escalation in --hosts-file option
 Cat (https://github.com/ecat3)
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
index 089152efc..9f19b6dd8 100644
--- a/src/fcopy/main.c
+++ b/src/fcopy/main.c
@@ -23,6 +23,8 @@
 #include <ftw.h>
 #include <errno.h>
 
+static int arg_follow_link = 0;
+
 
 #define COPY_LIMIT (500 * 1024 *1024)
 static int size_limit_reached = 0;
@@ -221,7 +223,7 @@ static void duplicate_dir(const char *src, const char *dest, struct stat *s) {
 }
 
 static void duplicate_file(const char *src, const char *dest, struct stat *s) {
-        char *rsrc = check(src); // we drop the result and use the original name
+        char *rsrc = check(src);
         char *rdest = check(dest);
         uid_t uid = s->st_uid;
         gid_t gid = s->st_gid;
@@ -229,7 +231,7 @@ static void duplicate_file(const char *src, const char *dest, struct stat *s) {
 
         // build destination file name
         char *name;
-        char *ptr = strrchr(src, '/');
+        char *ptr = (arg_follow_link)? strrchr(src, '/'): strrchr(rsrc, '/');
         ptr++;
         if (asprintf(&name, "%s/%s", rdest, ptr) == -1)
                 errExit("asprintf");
@@ -251,7 +253,7 @@ static void duplicate_link(const char *src, const char *dest, struct stat *s) {
 
         // build destination file name
         char *name;
-//      char *ptr = strrchr(rsrc, '/');
+//     char *ptr = strrchr(rsrc, '/');
         char *ptr = strrchr(src, '/');
         ptr++;
         if (asprintf(&name, "%s/%s", rdest, ptr) == -1)
@@ -287,19 +289,19 @@ printf("\n");
 #endif  
         char *src;
         char *dest;
-        int follow_link;
 
         if (argc == 3) {
                 src = argv[1];
                 dest = argv[2];
-                follow_link = 0;
+                arg_follow_link = 0;
         }
         else if (argc == 4 && !strcmp(argv[1], "--follow-link")) {
                 src = argv[2];
                 dest = argv[3];
-                follow_link = 1;
+                arg_follow_link = 1;
         }
         else {
+                    fprintf(stderr, "Error: arguments missing\n");
                 usage();
                 exit(1);
         }
@@ -334,7 +336,7 @@ printf("\n");
         }
 
         // copy files
-        if ((follow_link ? stat : lstat)(src, &s) == -1) {
+        if ((arg_follow_link ? stat : lstat)(src, &s) == -1) {
                 fprintf(stderr, "Error fcopy: src %s: %s\n", src, strerror(errno));
                 exit(1);
         }
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index 547978b47..3473fca4c 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -111,7 +111,7 @@ static void duplicate(char *fname) {
                 errExit("asprintf");
         
         // copy the file
-        sbox_run(SBOX_ROOT| SBOX_SECCOMP, 3, PATH_FCOPY, full_path, RUN_BIN_DIR);
+        sbox_run(SBOX_ROOT| SBOX_SECCOMP, 4, PATH_FCOPY, "--follow-link", full_path, RUN_BIN_DIR);
         fs_logger2("clone", fname);
         free(full_path);
 }
diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp
index 3ea33b01b..10dd8da58 100755
--- a/test/fcopy/cmdline.exp
+++ b/test/fcopy/cmdline.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "/usr/lib/firejail/fcopy\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "files missing"
+        "arguments missing"
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -21,7 +21,7 @@ after 100
 send -- "/usr/lib/firejail/fcopy foo\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "files missing"
+        "arguments missing"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
@@ -32,14 +32,14 @@ after 100
 send -- "/usr/lib/firejail/fcopy f%oo1 foo2\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "invalid file name"
+        "invalid source file name"
 }
 after 100
 
 send -- "/usr/lib/firejail/fcopy foo1 f,oo2\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "invalid file name"
+        "invalid dest file name"
 }
 after 100
 
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp
index f2f30914d..259eb4f9e 100755
--- a/test/fs/private-home.exp
+++ b/test/fs/private-home.exp
@@ -89,7 +89,7 @@ expect {
         "Child process initialized"
 }
 after 100
-send -- "file file ~/_firejail_test_link2\r"
+send -- "file ~/_firejail_test_link2\r"
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
         "broken symbolic link"