From: Wayne Davison <wayned@samba.org>
Date: Sat, 18 Jun 2011 19:44:26 +0000 (-0700)
Subject: Make daemon-exclude errors more error-like.
X-Git-Tag: v3.0.9pre1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33e37a49baf7a3d65025c10a1899741d201a3f2c;p=thirdparty%2Frsync.git

Make daemon-exclude errors more error-like.
Fixes bug 7765.
---

diff --git a/generator.c b/generator.c
index 88a762aa..d7e1ba85 100644
--- a/generator.c
+++ b/generator.c
@@ -1355,7 +1355,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 b6cc6bde..e23e570a 100644
--- a/main.c
+++ b/main.c
@@ -526,7 +526,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);
 		}