X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7b9598b2d5d0aa6aefe06731dc60612ee98646da..4d91a5f8f47d93ac55ac573e53e67fdf1f51f9c5:/options.c

diff --git a/options.c b/options.c
index 5adcf7bc..a404a8da 100644
--- a/options.c
+++ b/options.c
@@ -1887,6 +1887,9 @@ void server_options(char **args,int *argc)
 	if (numeric_ids)
 		args[ac++] = "--numeric-ids";
 
+	if (!allow_inc_recurse)
+		args[ac++] = "--no-ir";
+
 	if (am_sender) {
 		if (ignore_existing)
 			args[ac++] = "--ignore-existing";
@@ -1978,7 +1981,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
 			if (p[1] == ':')
 				*port_ptr = atoi(p+2);
 		} else {
-			if ((p = strchr(s, ':')) != NULL) {
+			if ((p = strchr(s, ':')) != NULL && p < s + hostlen) {
 				hostlen = p - s;
 				*port_ptr = atoi(p+1);
 			}