X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/18ae7b8789354cbf9ebac5a94796e7c17dd8df83..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/openssl-support.diff diff --git a/openssl-support.diff b/openssl-support.diff index a8b097f..daa419b 100644 --- a/openssl-support.diff +++ b/openssl-support.diff @@ -1,12 +1,4 @@ -After applying this patch, run these commands for a successful build: - - autoconf - autoheader - ./configure - make proto - make - -Casey Marshall writes: +Casey Marshall wrote: I've been hacking together a way to use rsync with OpenSSL, and have attached my current patch against a recent CVS tree. The details of @@ -20,7 +12,7 @@ this implementation are: #starttls - And, if the server allows SSL, it replies with + And, if the daemon allows SSL, it replies with @RSYNCD: starttls @@ -36,62 +28,75 @@ this implementation are: All warnings apply; I don't do C programming all that often, so I can't say if I've left any cleanup/compatibility errors in the code. +To use this patch, run these commands for a successful build: ---- orig/Makefile.in 2004-11-02 16:47:15 -+++ Makefile.in 2004-10-08 20:17:06 -@@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o + patch -p1 3) { - rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", - code, safe_fname(file), line); ---- orig/clientserver.c 2005-03-31 00:24:21 -+++ clientserver.c 2004-10-08 20:44:59 -@@ -45,6 +45,9 @@ extern int select_timeout; - extern int orig_umask; - extern int no_detach; - extern int default_af_hint; -+#if HAVE_OPENSSL + /* FALLTHROUGH */ + #include "case_N.h" + +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; ++#ifdef HAVE_OPENSSL +extern int use_ssl; +#endif - extern char *bind_address; - extern struct filter_list_struct server_filter_list; - extern char *config_file; -@@ -99,8 +102,18 @@ int start_socket_client(char *host, char - exit_cleanup(RERR_SOCKETIO); + extern int rsync_port; + extern int protect_args; + extern int ignore_errors; +@@ -133,8 +136,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[], + #endif - ret = start_inband_exchange(user, path, fd, fd, argc); -+ if (ret < 0) + ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv); ++ if (ret) + return ret; + -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + if (use_ssl) { + int f_in = get_tls_rfd(); + int f_out = get_tls_wfd(); @@ -99,20 +104,20 @@ can't say if I've left any cleanup/compatibility errors in the code. + } +#endif -- return ret < 0? ret : client_run(fd, fd, -1, argc, argv); +- return ret ? ret : client_run(fd, fd, -1, argc, argv); + return client_run(fd, fd, -1, argc, argv); } - int start_inband_exchange(char *user, char *path, int f_in, int f_out, -@@ -161,6 +174,33 @@ int start_inband_exchange(char *user, ch - if (verbose > 1) - print_child_argv(sargs); + static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client) +@@ -277,6 +290,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char + if (DEBUG_GTE(CMD, 1)) + print_child_argv("sending daemon args:", sargs); -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + if (use_ssl) { + io_printf(f_out, "#starttls\n"); + while (1) { -+ if (!read_line(f_in, line, sizeof(line)-1)) { ++ if (!read_line_old(f_in, line, sizeof line)) { + rprintf(FERROR, "rsync: did not receive reply to #starttls\n"); + return -1; + } @@ -120,9 +125,8 @@ can't say if I've left any cleanup/compatibility errors in the code. + rprintf(FERROR, "%s\n", line); + return -1; + } -+ if (strcmp(line, "@RSYNCD: starttls") == 0) { ++ if (strcmp(line, "@RSYNCD: starttls") == 0) + break; -+ } + rprintf(FINFO, "%s\n", line); + } + if (start_tls(f_in, f_out)) { @@ -135,54 +139,46 @@ can't say if I've left any cleanup/compatibility errors in the code. + } +#endif + - p = strchr(path,'/'); - if (p) *p = 0; - io_printf(f_out, "%s\n", path); -@@ -189,6 +229,10 @@ int start_inband_exchange(char *user, ch + io_printf(f_out, "%.*s\n", modlen, modname); + + /* Old servers may just drop the connection here, +@@ -302,6 +341,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. */ -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + if (use_ssl) + end_tls(); +#endif exit(0); } -@@ -196,6 +240,10 @@ int start_inband_exchange(char *user, ch +@@ -309,6 +352,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. */ -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + if (use_ssl) + end_tls(); +#endif - return RERR_STARTCLIENT; - } else { - rprintf(FINFO,"%s\n", line); -@@ -549,6 +597,7 @@ static void send_listing(int fd) - io_printf(fd,"@RSYNCD: EXIT\n"); - } + return -1; + } -+ - /* 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 */ -@@ -598,6 +647,9 @@ int start_daemon(int f_in, int f_out) - if (protocol_version > remote_protocol) - protocol_version = remote_protocol; +@@ -1028,6 +1075,9 @@ int start_daemon(int f_in, int f_out) + if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0) + return -1; -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL +retry: +#endif line[0] = 0; - if (!read_line(f_in, line, sizeof line - 1)) + if (!read_line_old(f_in, line, sizeof line)) return -1; -@@ -607,6 +659,20 @@ int start_daemon(int f_in, int f_out) +@@ -1039,6 +1089,20 @@ int start_daemon(int f_in, int f_out) return -1; } -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + if (use_ssl && strcmp(line, "#starttls") == 0) { + io_printf(f_out, "@RSYNCD: starttls\n"); + if (start_tls(f_in, f_out)) { @@ -199,10 +195,11 @@ can't say if I've left any cleanup/compatibility errors in the code. if (*line == '#') { /* it's some sort of command that I don't understand */ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line); ---- orig/configure.in 2005-03-29 11:15:05 -+++ configure.in 2004-07-03 20:22:28 -@@ -271,6 +271,21 @@ yes - AC_SEARCH_LIBS(getaddrinfo, inet6) +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -318,6 +318,21 @@ if test x"$enable_locale" != x"no"; then + AC_DEFINE(CONFIG_LOCALE) fi +AC_ARG_ENABLE(openssl, @@ -223,13 +220,14 @@ 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/options.c 2005-03-31 00:24:21 -+++ options.c 2005-03-01 01:34:42 -@@ -156,6 +156,14 @@ int log_format_has_o_or_i = 0; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -191,6 +191,14 @@ int logfile_format_has_o_or_i = 0; int always_checksum = 0; int list_only = 0; -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL +int use_ssl = 0; +char *ssl_cert_path = NULL; +char *ssl_key_path = NULL; @@ -240,93 +238,149 @@ 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; -@@ -181,6 +189,7 @@ static void print_rsync_version(enum log - char const *hardlinks = "no "; +@@ -567,6 +575,7 @@ static void print_rsync_version(enum logcode f) char const *links = "no "; + char const *iconv = "no "; char const *ipv6 = "no "; + char const *ssl = "no "; STRUCT_STAT *dumstat; - #ifdef HAVE_SOCKETPAIR -@@ -203,6 +212,10 @@ static void print_rsync_version(enum log - ipv6 = ""; + #if SUBPROTOCOL_VERSION != 0 +@@ -600,6 +609,9 @@ static void print_rsync_version(enum logcode f) + #ifdef CAN_SET_SYMLINK_TIMES + symtimes = ""; #endif - -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + ssl = ""; +#endif -+ - rprintf(f, "%s version %s protocol version %d\n", - RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); - rprintf(f, -@@ -216,10 +229,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. */ -- rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n", -+ 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 (int64) * 8)); -+ (int) (sizeof (int64) * 8), ssl); + + rprintf(f, "%s version %s protocol version %d%s\n", + RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); +@@ -613,8 +625,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); +- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes\n", +- have_inplace, acls, xattrs, iconv, symtimes); ++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sSSL\n", ++ have_inplace, acls, xattrs, iconv, symtimes, ssl); + #ifdef MAINTAINER_MODE - rprintf(f, " panic action: \"%s\"\n", - get_panic_action()); -@@ -350,6 +363,13 @@ void usage(enum logcode F) + rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); +@@ -785,6 +797,13 @@ void usage(enum logcode F) + #endif rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); - #endif -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + rprintf(F," --ssl allow socket connections to use SSL\n"); -+ rprintf(F," --ssl-cert=FILE path to server's SSL certificate\n"); -+ rprintf(F," --ssl-key=FILE path to server's SSL private key\n"); ++ rprintf(F," --ssl-cert=FILE path to daemon's SSL certificate\n"); ++ rprintf(F," --ssl-key=FILE path to daemon's SSL private key\n"); + rprintf(F," --ssl-key-passwd=PASS password for PEM-encoded private key\n"); + rprintf(F," --ssl-ca-certs=FILE path to trusted CA certificates\n"); +#endif - rprintf(F," -h, --help show this help screen\n"); + rprintf(F," --version print version number\n"); + rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); - rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); -@@ -360,7 +380,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}; +@@ -798,7 +817,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, +- OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, ++ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_USE_SSL, + OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT, + OPT_SERVER, OPT_REFUSED_BASE = 9000}; - static struct poptOption long_options[] = { -@@ -459,6 +479,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 -+#if HAVE_OPENSSL +@@ -1013,6 +1032,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 }, ++#ifdef HAVE_OPENSSL + {"ssl", 0, POPT_ARG_NONE, 0, OPT_USE_SSL, 0, 0}, + {"ssl-cert", 0, POPT_ARG_STRING, &ssl_cert_path, OPT_USE_SSL, 0, 0}, + {"ssl-key", 0, POPT_ARG_STRING, &ssl_key_path, OPT_USE_SSL, 0, 0}, + {"ssl-key-passwd", 0, POPT_ARG_STRING, &ssl_key_passwd, OPT_USE_SSL, 0, 0}, + {"ssl-ca-certs", 0, POPT_ARG_STRING, &ssl_ca_path, OPT_USE_SSL, 0, 0}, +#endif - /* All these options switch us into daemon-mode option-parsing. */ - {"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, + /* All the following options switch us into daemon-mode option-parsing. */ {"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 }, -@@ -863,6 +890,12 @@ int parse_arguments(int *argc, const cha - basis_dir[basis_dir_cnt++] = (char *)arg; - break; + {"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 }, +@@ -1040,6 +1066,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"); ++#ifdef HAVE_OPENSSL ++ rprintf(F," --ssl allow socket connections to use SSL\n"); ++ rprintf(F," --ssl-cert=FILE path to daemon's SSL certificate\n"); ++ rprintf(F," --ssl-key=FILE path to daemon's SSL private key\n"); ++ rprintf(F," --ssl-key-passwd=PASS password for PEM-encoded private key\n"); ++ rprintf(F," --ssl-ca-certs=FILE path to trusted CA certificates\n"); ++#endif + rprintf(F," --help show this help screen\n"); + rprintf(F,"\n"); +@@ -1065,6 +1098,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 }, ++#ifdef HAVE_OPENSSL ++ {"ssl", 0, POPT_ARG_NONE, 0, OPT_USE_SSL, 0, 0}, ++ {"ssl-cert", 0, POPT_ARG_STRING, &ssl_cert_path, OPT_USE_SSL, 0, 0}, ++ {"ssl-key", 0, POPT_ARG_STRING, &ssl_key_path, OPT_USE_SSL, 0, 0}, ++ {"ssl-key-passwd", 0, POPT_ARG_STRING, &ssl_key_passwd, OPT_USE_SSL, 0, 0}, ++ {"ssl-ca-certs", 0, POPT_ARG_STRING, &ssl_ca_path, OPT_USE_SSL, 0, 0}, ++#endif + {"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 }, +@@ -1360,6 +1400,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) + verbose++; + break; + ++#ifdef HAVE_OPENSSL ++ case OPT_USE_SSL: ++ use_ssl = 1; ++ break; ++#endif ++ + default: + rprintf(FERROR, + "rsync: %s: %s (in daemon mode)\n", +@@ -1386,6 +1432,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) + exit_cleanup(RERR_SYNTAX); + } + ++#ifdef HAVE_OPENSSL ++ if (use_ssl) { ++ if (init_tls()) { ++ snprintf(err_buf, sizeof(err_buf), ++ "Openssl error: %s\n", ++ get_ssl_error()); ++ return 0; ++ } ++ } ++#endif ++ + *argv_p = argv = poptGetArgs(pc); + *argc_p = argc = count_args(argv); + am_starting_up = 0; +@@ -1764,6 +1821,12 @@ int parse_arguments(int *argc_p, const char ***argv_p) + return 0; + #endif + ++#ifdef HAVE_OPENSSL + case OPT_USE_SSL: -+#if HAVE_OPENSSL + use_ssl = 1; -+#endif + break; ++#endif + default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1111,6 +1144,17 @@ int parse_arguments(int *argc, const cha +@@ -2160,6 +2223,17 @@ int parse_arguments(int *argc_p, const char ***argv_p) if (delay_updates && !partial_dir) - partial_dir = partialdir_for_delayupdate; + partial_dir = tmp_partialdir; -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL + if (use_ssl) { + if (init_tls()) { + snprintf(err_buf, sizeof(err_buf), @@ -340,64 +394,58 @@ can't say if I've left any cleanup/compatibility errors in the code. if (inplace) { #ifdef HAVE_FTRUNCATE if (partial_dir) { -@@ -1478,11 +1522,28 @@ char *check_for_hostspec(char *s, char * +@@ -2750,9 +2824,18 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) { - char *p; - int not_host; -+ int url_prefix_len = sizeof URL_PREFIX - 1; + char *path; - if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) { -+ if (!port_ptr) -+ url_prefix_len = 0; -+ else if (strncasecmp(URL_PREFIX, s, url_prefix_len) != 0) { -+#if HAVE_OPENSSL -+ url_prefix_len = sizeof SSL_URL_PREFIX - 1; -+ if (strncasecmp(SSL_URL_PREFIX, s, url_prefix_len) != 0) -+ url_prefix_len = 0; -+ else { +- *host_ptr = parse_hostspec(s + strlen(URL_PREFIX), &path, port_ptr); +- if (*host_ptr) { ++ if (port_ptr) { ++ int url_prefix_len; ++ if (strncasecmp(URL_PREFIX, s, sizeof URL_PREFIX - 1) == 0) ++ url_prefix_len = sizeof URL_PREFIX - 1; ++ else if (strncasecmp(SSL_URL_PREFIX, s, sizeof SSL_URL_PREFIX - 1) == 0) { + if (!use_ssl) + init_tls(); + use_ssl = 1; -+ } -+#else -+ url_prefix_len = 0; -+#endif -+ } -+ if (url_prefix_len) { - char *path; - int hostlen; -- s += strlen(URL_PREFIX); -+ s += url_prefix_len; - if ((p = strchr(s, '/')) != NULL) { - hostlen = p - s; - path = p + 1; ---- orig/rsync.h 2005-03-28 20:56:55 -+++ rsync.h 2004-10-08 21:01:33 -@@ -32,6 +32,7 @@ ++ url_prefix_len = sizeof SSL_URL_PREFIX - 1; ++ } else ++ url_prefix_len = 0; ++ if (url_prefix_len && (*host_ptr = parse_hostspec(s + url_prefix_len, &path, port_ptr))) { + if (!*port_ptr) + *port_ptr = RSYNC_PORT; + return path; +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 "~" - -@@ -411,6 +412,11 @@ enum msgcode { + #define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */ + #define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1) +@@ -581,6 +582,11 @@ typedef unsigned int size_t; # define SIZEOF_INT64 SIZEOF_OFF_T #endif -+#if HAVE_OPENSSL ++#ifdef HAVE_OPENSSL +#include +#include +#endif + - /* Starting from protocol version 26, we always use 64-bit - * ino_t and dev_t internally, even if this platform does not - * allow files to have 64-bit inums. That's because the ---- orig/ssl.c 2004-10-08 19:37:22 -+++ ssl.c 2004-10-08 19:37:22 -@@ -0,0 +1,366 @@ + struct hashtable { + void *nodes; + int32 size, entries; +diff --git a/ssl.c b/ssl.c +new file mode 100644 +--- /dev/null ++++ b/ssl.c +@@ -0,0 +1,369 @@ +/* -*- c-file-style: "linux" -*- -+ * ssl.c: operations for negotiating SSL rsync connections. ++ * ssl.c: operations for negotiating SSL rsync connections. + * + * Copyright (C) 2003 Casey Marshall + * @@ -405,12 +453,12 @@ can't say if I've left any cleanup/compatibility errors in the code. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. -+ * ++ * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. -+ * ++ * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -418,7 +466,7 @@ can't say if I've left any cleanup/compatibility errors in the code. + +#include "rsync.h" + -+#if HAVE_SYS_SELECT_H ++#ifdef HAVE_SYS_SELECT_H +#include +#else +#include @@ -429,7 +477,6 @@ can't say if I've left any cleanup/compatibility errors in the code. + +#define BUF_SIZE 1024 + -+extern int verbose; +extern int am_daemon; +extern int am_server; + @@ -445,6 +492,10 @@ can't say if I've left any cleanup/compatibility errors in the code. +static int ssl_running; +static int ssl_pid = -1; + ++#ifdef HAVE_SIGACTION ++static struct sigaction sigact; ++#endif ++ +/** + * A non-interactive callback to be passed to SSL_CTX_set_default_password_cb, + * which merely copies the value of ssl_key_passwd into buf. This is @@ -511,7 +562,7 @@ can't say if I've left any cleanup/compatibility errors in the code. + cbs = buf; + break; + } -+ if (verbose > 2) { ++ if (DEBUG_GTE(CONNECT, 1)) { + rprintf(FLOG, "SSL: info_callback(%p,%s,%d)\n", ssl, cbs, val); + if (cb == SSL_CB_HANDSHAKE_DONE) { + SSL_CIPHER_description(SSL_get_current_cipher((SSL*)ssl), @@ -633,7 +684,7 @@ can't say if I've left any cleanup/compatibility errors in the code. + return 0; + } + -+ signal(SIGUSR1, tls_sigusr1); ++ SIGACTION(SIGUSR1, tls_sigusr1); + ssl = SSL_new(ssl_ctx); + if (!ssl) + goto closed;