From ddaef70cede8b8ed24b084b93208a2353745b1bd Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 16 Mar 2008 17:06:52 -0700
Subject: [PATCH] Make the --ignore-existing option not overwrite a regular
 file with a dir/symlink/device/special-file, just like it already refuses to
 overwrite a non-regular file with a regular file.

---
 generator.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/generator.c b/generator.c
index 4ec0ac41..909c0f4d 100644
--- a/generator.c
+++ b/generator.c
@@ -1358,6 +1358,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	 && !am_root && sx.st.st_uid == our_uid)
 		del_opts |= DEL_NO_UID_WRITE;
 
+	if (ignore_existing > 0 && statret == 0
+	 && (!is_dir || !S_ISDIR(sx.st.st_mode))) {
+		if (verbose > 1 && is_dir >= 0)
+			rprintf(FINFO, "%s exists\n", fname);
+		goto cleanup;
+	}
+
 	if (is_dir) {
 		if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
 			goto cleanup;
@@ -1663,12 +1670,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		goto cleanup;
 	}
 
-	if (ignore_existing > 0 && statret == 0) {
-		if (verbose > 1)
-			rprintf(FINFO, "%s exists\n", fname);
-		goto cleanup;
-	}
-
 	if (update_only > 0 && statret == 0
 	    && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
 		if (verbose > 1)
-- 
2.34.1