From: Wayne Davison <wayned@samba.org>
Date: Sat, 4 Jun 2016 18:53:33 +0000 (-0700)
Subject: Fix path check when prior_dir_file is NULL.
X-Git-Tag: v3.1.3pre1~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=359758d61134e3e5d99ca3cca442fb05ed96069d;p=thirdparty%2Frsync.git

Fix path check when prior_dir_file is NULL.
---

diff --git a/generator.c b/generator.c
index fd7c8f86..fe5fece1 100644
--- a/generator.c
+++ b/generator.c
@@ -1266,7 +1266,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			 * this function was asked to process in the file list. */
 			if (!inc_recurse
 			 && (*dn != '.' || dn[1]) /* Avoid an issue with --relative and the "." dir. */
-			 && (prior_dir_file && strcmp(dn, f_name(prior_dir_file, NULL)) != 0)
+			 && (!prior_dir_file || strcmp(dn, f_name(prior_dir_file, NULL)) != 0)
 			 && flist_find_name(cur_flist, dn, 1) < 0) {
 				rprintf(FERROR,
 					"ABORTING due to invalid path from sender: %s/%s\n",