X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7bc90b3066d9e83ef81b6e5d5dbaa0b02f519673..2b1366635dc416420ed2617260aafe17d259ae0f:/options.c

diff --git a/options.c b/options.c
index 3611e134..944bb249 100644
--- a/options.c
+++ b/options.c
@@ -914,7 +914,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			"You may not combine multiple --delete-WHEN options.\n");
 		return 0;
 	}
-	if (delete_before || delete_during || delete_after)
+	if (!recurse) {
+		delete_before = delete_during = delete_after = 0;
+		delete_mode = delete_excluded = 0;
+	} else if (delete_before || delete_during || delete_after)
 		delete_mode = 1;
 	else if (delete_mode || delete_excluded)
 		delete_mode = delete_before = 1;
@@ -1126,7 +1129,7 @@ void server_options(char **args,int *argc)
 	if (copy_links)
 		argstr[x++] = 'L';
 	if (xfer_dirs > 1)
-		argstr[x++] = 'k';
+		argstr[x++] = 'd';
 	if (keep_dirlinks && am_sender)
 		argstr[x++] = 'K';