From: Wayne Davison <wayned@samba.org>
Date: Mon, 7 Feb 2005 20:38:56 +0000 (+0000)
Subject: Added missing call to safe_fname().
X-Git-Tag: v2.6.4pre1~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6126d678b4e66b0286d05b50c6245c4c21cfea0;p=thirdparty%2Frsync.git

Added missing call to safe_fname().
---

diff --git a/exclude.c b/exclude.c
index d25b1b15..6cc8840f 100644
--- a/exclude.c
+++ b/exclude.c
@@ -278,7 +278,7 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
 		}
 		if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
 			rprintf(FERROR, "merge-file name overflows: %s\n",
-				merge_file);
+				safe_fname(merge_file));
 			return NULL;
 		}
 	} else {
@@ -291,7 +291,8 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
 		goto done;
 
 	if (dirbuf_len + fn_len >= MAXPATHLEN) {
-		rprintf(FERROR, "merge-file name overflows: %s\n", fn);
+		rprintf(FERROR, "merge-file name overflows: %s\n",
+			safe_fname(fn));
 		return NULL;
 	}
 	memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);