X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9c015a83e8fb4c83ba6c73768d9e99e00f2466f4..d1cfcd415f677c56430bff609fbd6a6086b11f0e:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index 1e34fad..2127ad7 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -72,7 +72,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (verbose > 3) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", code, file, line); ---- orig/clientserver.c 2005-01-01 21:11:00 +--- orig/clientserver.c 2005-01-25 00:53:58 +++ clientserver.c 2004-10-08 20:44:59 @@ -47,6 +47,9 @@ extern int select_timeout; extern int orig_umask; @@ -82,9 +82,9 @@ can't say if I've left any cleanup/compatibility errors in the code. +extern int use_ssl; +#endif extern char *bind_address; - extern struct exclude_list_struct server_exclude_list; - extern char *exclude_path_prefix; -@@ -98,8 +101,18 @@ int start_socket_client(char *host, char + extern struct filter_list_struct server_filter_list; + extern char *config_file; +@@ -100,8 +103,18 @@ int start_socket_client(char *host, char exit_cleanup(RERR_SOCKETIO); ret = start_inband_exchange(user, path, fd, fd, argc); @@ -104,9 +104,9 @@ can't say if I've left any cleanup/compatibility errors in the code. } int start_inband_exchange(char *user, char *path, int f_in, int f_out, -@@ -154,6 +167,33 @@ int start_inband_exchange(char *user, ch - if (protocol_version > remote_protocol) - protocol_version = remote_protocol; +@@ -162,6 +175,33 @@ int start_inband_exchange(char *user, ch + if (verbose > 1) + print_child_argv(sargs); +#ifdef HAVE_OPENSSL + if (use_ssl) { @@ -138,7 +138,7 @@ can't say if I've left any cleanup/compatibility errors in the code. p = strchr(path,'/'); if (p) *p = 0; io_printf(f_out, "%s\n", path); -@@ -182,6 +222,10 @@ int start_inband_exchange(char *user, ch +@@ -190,6 +230,10 @@ int start_inband_exchange(char *user, ch * server to terminate the listing of modules. * We don't want to go on and transfer * anything; just exit. */ @@ -149,7 +149,7 @@ can't say if I've left any cleanup/compatibility errors in the code. exit(0); } -@@ -189,6 +233,10 @@ int start_inband_exchange(char *user, ch +@@ -197,6 +241,10 @@ int start_inband_exchange(char *user, ch rprintf(FERROR, "%s\n", line); /* This is always fatal; the server will now * close the socket. */ @@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code. return RERR_STARTCLIENT; } else { rprintf(FINFO,"%s\n", line); -@@ -504,6 +552,7 @@ static void send_listing(int fd) +@@ -519,6 +567,7 @@ static void send_listing(int fd) io_printf(fd,"@RSYNCD: EXIT\n"); } @@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code. /* this is called when a connection is established to a client and we want to start talking. The setup of the system is done from here */ -@@ -553,6 +602,9 @@ int start_daemon(int f_in, int f_out) +@@ -568,6 +617,9 @@ int start_daemon(int f_in, int f_out) if (protocol_version > remote_protocol) protocol_version = remote_protocol; @@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code. line[0] = 0; if (!read_line(f_in, line, sizeof line - 1)) return -1; -@@ -562,6 +614,20 @@ int start_daemon(int f_in, int f_out) +@@ -577,6 +629,20 @@ int start_daemon(int f_in, int f_out) return -1; } @@ -223,9 +223,9 @@ can't say if I've left any cleanup/compatibility errors in the code. AC_MSG_CHECKING([whether to call shutdown on all sockets]) case $host_os in *cygwin* ) AC_MSG_RESULT(yes) ---- orig/main.c 2005-01-10 00:22:54 +--- orig/main.c 2005-01-24 01:43:10 +++ main.c 2004-10-08 20:15:28 -@@ -56,6 +56,9 @@ extern int write_batch; +@@ -57,6 +57,9 @@ extern int write_batch; extern int batch_fd; extern int batch_gen_fd; extern int filesfrom_fd; @@ -235,7 +235,7 @@ can't say if I've left any cleanup/compatibility errors in the code. extern pid_t cleanup_child_pid; extern char *files_from; extern char *remote_filesfrom_file; -@@ -806,33 +809,48 @@ static int start_client(int argc, char * +@@ -808,33 +811,48 @@ static int start_client(int argc, char * if ((rc = copy_argv(argv))) return rc; @@ -308,7 +308,7 @@ can't say if I've left any cleanup/compatibility errors in the code. p = find_colon(argv[0]); if (p) { /* source is remote */ if (remote_filesfrom_file -@@ -864,12 +882,26 @@ static int start_client(int argc, char * +@@ -866,12 +884,26 @@ static int start_client(int argc, char * argv++; } else { /* source is local */ am_sender = 1; @@ -338,9 +338,9 @@ can't say if I've left any cleanup/compatibility errors in the code. p = strchr(host,'/'); if (p) { *p = '\0'; ---- orig/options.c 2005-01-01 21:11:00 +--- orig/options.c 2005-01-25 03:26:51 +++ options.c 2004-11-27 18:31:46 -@@ -138,6 +138,14 @@ int quiet = 0; +@@ -144,6 +144,14 @@ int quiet = 0; int always_checksum = 0; int list_only = 0; @@ -355,7 +355,7 @@ can't say if I've left any cleanup/compatibility errors in the code. #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; -@@ -161,6 +169,7 @@ static void print_rsync_version(enum log +@@ -166,6 +174,7 @@ static void print_rsync_version(enum log char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; @@ -363,7 +363,7 @@ can't say if I've left any cleanup/compatibility errors in the code. STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR -@@ -183,6 +192,10 @@ static void print_rsync_version(enum log +@@ -188,6 +197,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif @@ -374,7 +374,7 @@ can't say if I've left any cleanup/compatibility errors in the code. rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, -@@ -196,10 +209,10 @@ static void print_rsync_version(enum log +@@ -201,10 +214,10 @@ static void print_rsync_version(enum log /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ @@ -382,12 +382,12 @@ can't say if I've left any cleanup/compatibility errors in the code. + rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums, %sssl\n", have_inplace, ipv6, (int) (sizeof dumstat->st_ino * 8), -- (int) (sizeof (uint64) * 8)); -+ (int) (sizeof (uint64) * 8), ssl); +- (int) (sizeof (int64) * 8)); ++ (int) (sizeof (int64) * 8), ssl); #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); -@@ -312,6 +325,13 @@ void usage(enum logcode F) +@@ -325,6 +338,13 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -401,16 +401,16 @@ can't say if I've left any cleanup/compatibility errors in the code. rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); -@@ -323,7 +343,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP - OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, - OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, +@@ -335,7 +355,7 @@ void usage(enum logcode F) + 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_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, - OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, + OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_USE_SSL, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -410,6 +430,13 @@ static struct poptOption long_options[] +@@ -428,6 +448,13 @@ static struct poptOption long_options[] {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, #endif @@ -424,7 +424,7 @@ can't say if I've left any cleanup/compatibility errors in the code. /* All these options switch us into daemon-mode option-parsing. */ {"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, -@@ -750,6 +777,12 @@ int parse_arguments(int *argc, const cha +@@ -788,6 +815,12 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -437,7 +437,7 @@ can't say if I've left any cleanup/compatibility errors in the code. default: /* A large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ -@@ -944,6 +977,17 @@ int parse_arguments(int *argc, const cha +@@ -995,6 +1028,17 @@ int parse_arguments(int *argc, const cha bwlimit_writemax = 512; } @@ -455,7 +455,7 @@ can't say if I've left any cleanup/compatibility errors in the code. if (inplace) { #if HAVE_FTRUNCATE if (partial_dir) { ---- orig/rsync.h 2005-01-10 00:21:12 +--- orig/rsync.h 2005-01-25 00:53:58 +++ rsync.h 2004-10-08 21:01:33 @@ -32,6 +32,7 @@ @@ -465,8 +465,8 @@ can't say if I've left any cleanup/compatibility errors in the code. #define BACKUP_SUFFIX "~" -@@ -340,6 +341,11 @@ enum msgcode { - #define uint64 unsigned off_t +@@ -339,6 +340,11 @@ enum msgcode { + #define INT64_IS_OFF_T #endif +#if HAVE_OPENSSL