The length check in make_file() doesn't need to subtract pathname_len
authorWayne Davison <wayned@samba.org>
Sat, 7 Jul 2007 16:01:59 +0000 (16:01 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 7 Jul 2007 16:01:59 +0000 (16:01 +0000)
anymore, as the sender code never concatenates the F_PATHNAME() value
with the dirname+basename string these days.

flist.c

diff --git a/flist.c b/flist.c
index 87dbf41..a6c324a 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1002,8 +1002,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
        alloc_pool_t *pool;
        char *bp;
 
-       if (strlcpy(thisname, fname, sizeof thisname)
-           >= sizeof thisname - pathname_len) {
+       if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
                rprintf(FINFO, "skipping overly long name: %s\n", fname);
                return NULL;
        }