X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e9d4ab8849c465e766a494765b29e26564f284d0..cc3e685d09b2095099fc396157d19172ab3ef7c4:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 65ba135..2953149 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -35,9 +35,10 @@ To use this patch, run these commands for a successful build: ./configure make ---- old/Makefile.in -+++ new/Makefile.in -@@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o +diff --git a/Makefile.in b/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in +@@ -40,7 +40,7 @@ OBJS3=progress.o pipe.o DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o @@ -46,8 +47,9 @@ To use this patch, run these commands for a successful build: TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@ ---- old/cleanup.c -+++ new/cleanup.c +diff --git a/cleanup.c b/cleanup.c +--- a/cleanup.c ++++ b/cleanup.c @@ -25,6 +25,9 @@ extern int am_server; extern int am_daemon; @@ -56,9 +58,9 @@ To use this patch, run these commands for a successful build: +extern int use_ssl; +#endif extern int keep_partial; - extern int log_got_error; + extern int got_xfer_error; extern char *partial_dir; -@@ -121,6 +124,14 @@ NORETURN void _exit_cleanup(int code, co +@@ -121,6 +124,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) code, file, line); } @@ -73,9 +75,10 @@ To use this patch, run these commands for a successful build: /* FALLTHROUGH */ #include "case_N.h" ---- old/clientserver.c -+++ new/clientserver.c -@@ -29,6 +29,9 @@ extern int am_sender; +diff --git a/clientserver.c b/clientserver.c +--- a/clientserver.c ++++ b/clientserver.c +@@ -30,6 +30,9 @@ extern int am_sender; extern int am_server; extern int am_daemon; extern int am_root; @@ -85,14 +88,13 @@ To use this patch, run these commands for a successful build: extern int rsync_port; extern int ignore_errors; extern int kluge_around_eof; -@@ -112,8 +115,18 @@ int start_socket_client(char *host, int +@@ -115,8 +118,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], set_socket_options(fd, sockopts); ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv); + if (ret) + return ret; - -- return ret ? ret : client_run(fd, fd, -1, argc, argv); ++ +#ifdef HAVE_OPENSSL + if (use_ssl) { + int f_in = get_tls_rfd(); @@ -100,12 +102,13 @@ To use this patch, run these commands for a successful build: + return client_run(f_in, f_out, -1, argc, argv); + } +#endif -+ + +- return ret ? ret : client_run(fd, fd, -1, argc, argv); + return client_run(fd, fd, -1, argc, argv); } static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client) -@@ -256,6 +269,32 @@ int start_inband_exchange(int f_in, int +@@ -259,6 +272,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); @@ -138,7 +141,7 @@ To use this patch, run these commands for a successful build: io_printf(f_out, "%.*s\n", modlen, modname); /* Old servers may just drop the connection here, -@@ -281,6 +320,10 @@ int start_inband_exchange(int f_in, int +@@ -284,6 +323,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. */ @@ -149,7 +152,7 @@ To use this patch, run these commands for a successful build: exit(0); } -@@ -288,6 +331,10 @@ int start_inband_exchange(int f_in, int +@@ -291,6 +334,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. */ @@ -160,7 +163,7 @@ To use this patch, run these commands for a successful build: return -1; } -@@ -818,6 +865,9 @@ int start_daemon(int f_in, int f_out) +@@ -835,6 +882,9 @@ int start_daemon(int f_in, int f_out) if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0) return -1; @@ -170,7 +173,7 @@ To use this patch, run these commands for a successful build: line[0] = 0; if (!read_line_old(f_in, line, sizeof line)) return -1; -@@ -829,6 +879,20 @@ int start_daemon(int f_in, int f_out) +@@ -846,6 +896,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -191,9 +194,10 @@ To use this patch, run these commands for a successful build: if (*line == '#') { /* it's some sort of command that I don't understand */ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); ---- old/configure.in -+++ new/configure.in -@@ -290,6 +290,21 @@ if test x"$enable_locale" != x"no"; then +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -295,6 +295,21 @@ if test x"$enable_locale" != x"no"; then AC_DEFINE(CONFIG_LOCALE) fi @@ -215,9 +219,10 @@ To use this patch, run these commands for a successful build: AC_MSG_CHECKING([whether to call shutdown on all sockets]) case $host_os in *cygwin* ) AC_MSG_RESULT(yes) ---- old/options.c -+++ new/options.c -@@ -182,6 +182,14 @@ int logfile_format_has_o_or_i = 0; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -183,6 +183,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; @@ -232,7 +237,7 @@ To use this patch, run these commands for a successful build: #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; -@@ -221,6 +229,7 @@ static void print_rsync_version(enum log +@@ -222,6 +230,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; @@ -240,7 +245,7 @@ To use this patch, run these commands for a successful build: STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -250,6 +259,9 @@ static void print_rsync_version(enum log +@@ -251,6 +260,9 @@ static void print_rsync_version(enum logcode f) #ifdef ICONV_OPTION iconv = ""; #endif @@ -250,7 +255,7 @@ To use this patch, run these commands for a successful build: rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -263,8 +275,8 @@ static void print_rsync_version(enum log +@@ -264,8 +276,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); @@ -261,7 +266,7 @@ To use this patch, run these commands for a successful build: #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -425,6 +437,13 @@ void usage(enum logcode F) +@@ -427,6 +439,13 @@ void usage(enum logcode F) #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -275,7 +280,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --version print version number\n"); rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); -@@ -438,7 +457,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -440,7 +459,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, @@ -284,7 +289,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -623,6 +642,13 @@ static struct poptOption long_options[] +@@ -626,6 +645,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 }, @@ -298,7 +303,7 @@ To use this patch, run these commands for a successful build: /* 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 }, -@@ -648,6 +674,13 @@ static void daemon_usage(enum logcode F) +@@ -651,6 +677,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"); @@ -312,7 +317,7 @@ To use this patch, run these commands for a successful build: rprintf(F," --help show this help screen\n"); rprintf(F,"\n"); -@@ -672,6 +705,13 @@ static struct poptOption long_daemon_opt +@@ -675,6 +708,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 }, @@ -326,7 +331,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -946,6 +986,12 @@ int parse_arguments(int *argc_p, const c +@@ -949,6 +989,12 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) verbose++; break; @@ -339,7 +344,7 @@ To use this patch, run these commands for a successful build: default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", -@@ -969,6 +1015,17 @@ int parse_arguments(int *argc_p, const c +@@ -972,6 +1018,17 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) exit_cleanup(RERR_SYNTAX); } @@ -357,7 +362,7 @@ To use this patch, run these commands for a successful build: *argv_p = argv = poptGetArgs(pc); *argc_p = argc = count_args(argv); am_starting_up = 0; -@@ -1221,6 +1278,12 @@ int parse_arguments(int *argc_p, const c +@@ -1224,6 +1281,12 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) return 0; #endif @@ -370,7 +375,7 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1535,6 +1598,17 @@ int parse_arguments(int *argc_p, const c +@@ -1538,6 +1601,17 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) if (delay_updates && !partial_dir) partial_dir = tmp_partialdir; @@ -388,13 +393,14 @@ To use this patch, run these commands for a successful build: if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -2007,10 +2081,27 @@ char *check_for_hostspec(char *s, char * +@@ -2010,10 +2084,27 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) char *p; int not_host; int hostlen; -+ int url_prefix_len = sizeof URL_PREFIX - 1; - +- - if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) { ++ int url_prefix_len = sizeof URL_PREFIX - 1; ++ + if (!port_ptr) + url_prefix_len = 0; + else if (strncasecmp(URL_PREFIX, s, url_prefix_len) != 0) { @@ -418,17 +424,18 @@ To use this patch, run these commands for a successful build: if ((p = strchr(s, '/')) != NULL) { hostlen = p - s; path = p + 1; ---- old/rsync.h -+++ new/rsync.h +diff --git a/rsync.h b/rsync.h +--- a/rsync.h ++++ b/rsync.h @@ -31,6 +31,7 @@ #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" +#define SSL_URL_PREFIX "rsyncs://" - #define BACKUP_SUFFIX "~" - -@@ -520,6 +521,11 @@ typedef unsigned int size_t; + #define SYMLINK_PREFIX "/rsyncd-munged/" + #define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1) +@@ -536,6 +537,11 @@ typedef unsigned int size_t; # define SIZEOF_INT64 SIZEOF_OFF_T #endif @@ -440,8 +447,10 @@ To use this patch, run these commands for a successful build: struct hashtable { void *nodes; int32 size, entries; ---- old/ssl.c -+++ new/ssl.c +diff --git a/ssl.c b/ssl.c +new file mode 100644 +--- /dev/null ++++ b/ssl.c @@ -0,0 +1,370 @@ +/* -*- c-file-style: "linux" -*- + * ssl.c: operations for negotiating SSL rsync connections.