Make daemon-exclude errors more error-like.
authorWayne Davison <wayned@samba.org>
Sat, 18 Jun 2011 19:44:26 +0000 (12:44 -0700)
committerWayne Davison <wayned@samba.org>
Sat, 18 Jun 2011 19:44:26 +0000 (12:44 -0700)
Fixes bug 7765.

generator.c
main.c

index b8d930e627755d1145b250e906520e4845c42af9..849130072d71c51d9199b9b70e10a2b9d16516ba 100644 (file)
@@ -1178,7 +1178,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                handle_skipped_hlink(file, itemizing, code, f_out);
 #endif
                        rprintf(FERROR_XFER,
-                               "skipping daemon-excluded %s \"%s\"\n",
+                               "ERROR: daemon refused to receive %s \"%s\"\n",
                                is_dir ? "directory" : "file", fname);
                        if (is_dir)
                                goto skipping_dir_contents;
diff --git a/main.c b/main.c
index 16b283cdc817cd3942eb77ac42d971798532f06b..5a06f177ca6e474fe84b88b167d52b47796bb09a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -594,7 +594,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                if ((*dest_path != '.' || dest_path[1] != '\0')
                 && (check_filter(&daemon_filter_list, FLOG, dest_path, 0) < 0
                  || check_filter(&daemon_filter_list, FLOG, dest_path, 1) < 0)) {
-                       rprintf(FERROR, "skipping daemon-excluded destination \"%s\"\n",
+                       rprintf(FERROR, "ERROR: daemon has excluded destination \"%s\"\n",
                                dest_path);
                        exit_cleanup(RERR_FILESELECT);
                }