X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e2e42a01ba5a2258edf1510280bb83864a0c8748..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 2b51359..888800c 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -88,7 +88,7 @@ diff --git a/clientserver.c b/clientserver.c extern int rsync_port; extern int protect_args; extern int ignore_errors; -@@ -126,8 +129,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], +@@ -128,8 +131,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], #endif ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv); @@ -108,7 +108,7 @@ diff --git a/clientserver.c b/clientserver.c } static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client) -@@ -270,6 +283,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char +@@ -272,6 +285,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char if (verbose > 1) print_child_argv("sending daemon args:", sargs); @@ -141,7 +141,7 @@ diff --git a/clientserver.c b/clientserver.c io_printf(f_out, "%.*s\n", modlen, modname); /* Old servers may just drop the connection here, -@@ -295,6 +334,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char +@@ -297,6 +336,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char * server to terminate the listing of modules. * We don't want to go on and transfer * anything; just exit. */ @@ -152,7 +152,7 @@ diff --git a/clientserver.c b/clientserver.c exit(0); } -@@ -302,6 +345,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char +@@ -304,6 +347,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ @@ -163,7 +163,7 @@ diff --git a/clientserver.c b/clientserver.c return -1; } -@@ -935,6 +982,9 @@ int start_daemon(int f_in, int f_out) +@@ -934,6 +981,9 @@ int start_daemon(int f_in, int f_out) if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0) return -1; @@ -173,7 +173,7 @@ diff --git a/clientserver.c b/clientserver.c line[0] = 0; if (!read_line_old(f_in, line, sizeof line)) return -1; -@@ -946,6 +996,20 @@ int start_daemon(int f_in, int f_out) +@@ -945,6 +995,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -245,7 +245,7 @@ diff --git a/options.c b/options.c STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -257,6 +266,9 @@ static void print_rsync_version(enum logcode f) +@@ -258,6 +267,9 @@ static void print_rsync_version(enum logcode f) #if defined HAVE_LUTIMES && defined HAVE_UTIMES symtimes = ""; #endif @@ -255,7 +255,7 @@ diff --git a/options.c b/options.c rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -270,8 +282,8 @@ static void print_rsync_version(enum logcode f) +@@ -271,8 +283,8 @@ static void print_rsync_version(enum logcode f) (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); @@ -266,7 +266,7 @@ diff --git a/options.c b/options.c #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -433,6 +445,13 @@ void usage(enum logcode F) +@@ -434,6 +446,13 @@ void usage(enum logcode F) #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -280,7 +280,7 @@ diff --git a/options.c b/options.c rprintf(F," --version print version number\n"); rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); -@@ -446,7 +465,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, +@@ -447,7 +466,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, @@ -289,7 +289,7 @@ diff --git a/options.c b/options.c OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -649,6 +668,13 @@ static struct poptOption long_options[] = { +@@ -650,6 +669,13 @@ static struct poptOption long_options[] = { {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, @@ -303,7 +303,7 @@ diff --git a/options.c b/options.c /* All the following options switch us into daemon-mode option-parsing. */ {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 }, -@@ -674,6 +700,13 @@ static void daemon_usage(enum logcode F) +@@ -675,6 +701,13 @@ static void daemon_usage(enum logcode F) rprintf(F," -v, --verbose increase verbosity\n"); rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -317,7 +317,7 @@ diff --git a/options.c b/options.c rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -698,6 +731,13 @@ static struct poptOption long_daemon_options[] = { +@@ -699,6 +732,13 @@ static struct poptOption long_daemon_options[] = { {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, @@ -331,7 +331,7 @@ diff --git a/options.c b/options.c {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, -@@ -979,6 +1019,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -980,6 +1020,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) verbose++; break; @@ -344,7 +344,7 @@ diff --git a/options.c b/options.c default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -1002,6 +1048,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -1003,6 +1049,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) exit_cleanup(RERR_SYNTAX); } @@ -362,7 +362,7 @@ diff --git a/options.c b/options.c *argv_p = argv = poptGetArgs(pc); *argc_p = argc = count_args(argv); am_starting_up = 0; -@@ -1260,6 +1317,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -1261,6 +1318,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) return 0; #endif @@ -375,7 +375,7 @@ diff --git a/options.c b/options.c default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1593,6 +1656,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) +@@ -1594,6 +1657,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -393,7 +393,7 @@ diff --git a/options.c b/options.c if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -2072,10 +2146,27 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) +@@ -2087,10 +2161,27 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) char *p; int not_host; int hostlen; @@ -435,7 +435,7 @@ diff --git a/rsync.h b/rsync.h #define SYMLINK_PREFIX "/rsyncd-munged/" #define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1) -@@ -547,6 +548,11 @@ typedef unsigned int size_t; +@@ -549,6 +550,11 @@ typedef unsigned int size_t; # define SIZEOF_INT64 SIZEOF_OFF_T #endif