Don't allow a --partial-dir setting to overwrite a server-excluded

file (affects a daemon receiver only).

diff --git a/util.c b/util.c
index 95709a9..528efd4 100644 (file)
--- a/util.c
+++ b/util.c
@@ -991,6 +991,9 @@ char *partial_dir_fname(const char *fname)
                fn = fname;
        if ((int)pathjoin(t, sz, partial_dir, fn) >= sz)
                return NULL;
+       if (server_exclude_list.head
+           && check_exclude(&server_exclude_list, partial_fname, 0) < 0)
+               return NULL;
 
        return partial_fname;
 }