can't say if I've left any cleanup/compatibility errors in the code.
---- orig/Makefile.in 2004-07-04 08:59:17
-+++ Makefile.in 2004-07-03 20:22:28
+--- 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
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 \
-OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ @SSL_OBJS@
- TLS_OBJ = tls.o syscall.o lib/permstring.o
+ TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
+
+--- orig/cleanup.c 2005-03-05 18:58:38
++++ cleanup.c 2005-01-10 10:43:22
+@@ -22,6 +22,9 @@
+ #include "rsync.h"
---- orig/cleanup.c 2004-07-02 18:11:26
-+++ cleanup.c 2004-07-03 20:22:28
-@@ -24,6 +24,9 @@
extern int io_error;
- extern int keep_partial;
- extern int log_got_error;
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+extern int use_ssl;
+#endif
-
- /**
- * Close all open sockets and files, allowing a (somewhat) graceful
-@@ -98,6 +101,11 @@ void _exit_cleanup(int code, const char
+ extern int keep_partial;
+ extern int log_got_error;
+ extern char *partial_dir;
+@@ -97,6 +100,11 @@ void _exit_cleanup(int code, const char
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ if (use_ssl)
+ end_tls();
+#endif
+
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
---- orig/clientserver.c 2004-07-15 02:21:10
-+++ clientserver.c 2004-07-03 20:22:28
-@@ -46,6 +46,9 @@ extern int io_timeout;
+ code, safe_fname(file), line);
+--- orig/clientserver.c 2005-04-04 16:28:35
++++ 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;
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+extern int use_ssl;
+#endif
extern char *bind_address;
- extern struct exclude_list_struct server_exclude_list;
- extern char *exclude_path_prefix;
-@@ -93,8 +96,18 @@ int start_socket_client(char *host, char
+ 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);
ret = start_inband_exchange(user, path, fd, fd, argc);
+ if (ret < 0)
+ return ret;
+
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ if (use_ssl) {
+ int f_in = get_tls_rfd();
+ int f_out = get_tls_wfd();
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
-@@ -149,6 +162,33 @@ int start_inband_exchange(char *user, ch
- if (protocol_version > remote_protocol)
- protocol_version = remote_protocol;
+@@ -161,6 +174,33 @@ int start_inband_exchange(char *user, ch
+ if (verbose > 1)
+ print_child_argv(sargs);
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ if (use_ssl) {
+ io_printf(f_out, "#starttls\n");
+ while (1) {
+ return -1;
+ }
+ if (strncmp(line, "@ERROR", 6) == 0) {
-+ rprintf(FERROR, "rsync: ssl connection denied\n");
++ rprintf(FERROR, "%s\n", line);
+ return -1;
+ }
+ if (strcmp(line, "@RSYNCD: starttls") == 0) {
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -177,6 +217,10 @@ int start_inband_exchange(char *user, ch
+@@ -189,6 +229,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. */
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ if (use_ssl)
+ end_tls();
+#endif
exit(0);
}
-@@ -184,6 +228,10 @@ int start_inband_exchange(char *user, ch
+@@ -196,6 +240,10 @@ int start_inband_exchange(char *user, ch
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ if (use_ssl)
+ end_tls();
+#endif
return RERR_STARTCLIENT;
} else {
rprintf(FINFO,"%s\n", line);
-@@ -488,6 +536,7 @@ static void send_listing(int fd)
+@@ -547,6 +595,7 @@ static void send_listing(int fd)
io_printf(fd,"@RSYNCD: EXIT\n");
}
/* 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 */
-@@ -545,6 +594,20 @@ int start_daemon(int f_in, int f_out)
- return -1;
- }
+@@ -596,6 +645,9 @@ int start_daemon(int f_in, int f_out)
+ if (protocol_version > remote_protocol)
+ protocol_version = remote_protocol;
+#if HAVE_OPENSSL
-+ if (use_ssl && strcmp(line, "#starttls") == 0) {
-+ io_printf(f_out, "@RSYNCD: starttls\n");
-+ if (start_tls(f_in, f_out)) {
-+ rprintf(FLOG, "SSL connection failed: %s\n",
-+ get_ssl_error());
-+ return -1;
-+ }
-+ f_in = get_tls_rfd();
-+ f_out = get_tls_wfd();
-+ continue;
++retry:
++#endif
+ line[0] = 0;
+ if (!read_line(f_in, line, sizeof line - 1))
+ return -1;
+@@ -605,6 +657,20 @@ int start_daemon(int f_in, int f_out)
+ return -1;
+ }
+
++#if HAVE_OPENSSL
++ if (use_ssl && strcmp(line, "#starttls") == 0) {
++ io_printf(f_out, "@RSYNCD: starttls\n");
++ if (start_tls(f_in, f_out)) {
++ rprintf(FLOG, "SSL connection failed: %s\n",
++ get_ssl_error());
++ return -1;
+ }
++ f_in = get_tls_rfd();
++ f_out = get_tls_wfd();
++ goto retry;
++ }
+#endif
+
- 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 2004-04-30 18:04:07
+ 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-04-07 17:04:26
+++ configure.in 2004-07-03 20:22:28
-@@ -271,6 +271,21 @@ yes
+@@ -282,6 +282,21 @@ yes
AC_SEARCH_LIBS(getaddrinfo, inet6)
fi
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c 2004-07-15 17:02:03
-+++ main.c 2004-07-15 02:40:51
-@@ -54,6 +54,9 @@ extern int read_batch;
- extern int write_batch;
- extern int batch_fd;
- extern int filesfrom_fd;
-+#ifdef HAVE_OPENSSL
-+extern int use_ssl;
-+#endif
- extern pid_t cleanup_child_pid;
- extern char *files_from;
- extern char *remote_filesfrom_file;
-@@ -748,18 +751,32 @@ static int start_client(int argc, char *
- pid_t pid;
- int f_in,f_out;
- int rc;
-+ int url_prefix = strlen(URL_PREFIX);
-
- /* Don't clobber argv[] so that ps(1) can still show the right
- * command line. */
- if ((rc = copy_argv(argv)))
- return rc;
-
-+ if (strncasecmp(URL_PREFIX, argv[0], url_prefix) != 0 && !read_batch) {
-+#ifdef HAVE_OPENSSL
-+ url_prefix = strlen(SSL_URL_PREFIX);
-+ if (strncasecmp(SSL_URL_PREFIX, argv[0], url_prefix) != 0)
-+ url_prefix = 0;
-+ else {
-+ if (!use_ssl)
-+ init_tls();
-+ use_ssl = 1;
-+ }
-+#else
-+ url_prefix = 0;
-+#endif
-+ }
- /* rsync:// always uses rsync server over direct socket connection */
-- if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0
-- && !read_batch) {
-+ if (url_prefix) {
- char *host, *path;
-
-- host = argv[0] + strlen(URL_PREFIX);
-+ host = argv[0] + url_prefix;
- p = strchr(host,'/');
- if (p) {
- *p = 0;
-@@ -807,12 +824,27 @@ static int start_client(int argc, char *
- argv++;
- } else { /* source is local */
- am_sender = 1;
-+ url_prefix = strlen(URL_PREFIX);
-+ if (strncasecmp(URL_PREFIX, argv[0], url_prefix) != 0) {
-+#ifdef HAVE_OPENSSL
-+ url_prefix = strlen(SSL_URL_PREFIX);
-+ if (strncasecmp(SSL_URL_PREFIX, argv[0], url_prefix) != 0)
-+ url_prefix = 0;
-+ else {
-+ if (!use_ssl)
-+ init_tls();
-+ use_ssl = 1;
-+ }
-+#else
-+ url_prefix = 0;
-+#endif
-+ }
-
- /* rsync:// destination uses rsync server over direct socket */
-- if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) {
-+ if (url_prefix) {
- char *host, *path;
-
-- host = argv[argc-1] + strlen(URL_PREFIX);
-+ host = argv[argc-1] + url_prefix;
- p = strchr(host,'/');
- if (p) {
- *p = 0;
---- orig/options.c 2004-07-15 16:51:50
-+++ options.c 2004-07-15 02:41:12
-@@ -133,6 +133,14 @@ int quiet = 0;
+--- orig/options.c 2005-04-07 17:04:26
++++ options.c 2005-03-01 01:34:42
+@@ -156,6 +156,14 @@ int log_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+int use_ssl = 0;
+char *ssl_cert_path = NULL;
+char *ssl_key_path = NULL;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -144,13 +152,13 @@ static int modify_window_set;
- * address, or a hostname. **/
- char *bind_address;
-
--
- static void print_rsync_version(enum logcode f)
- {
- char const *got_socketpair = "no ";
+@@ -181,6 +189,7 @@ static void print_rsync_version(enum log
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -169,6 +177,10 @@ static void print_rsync_version(enum log
+@@ -203,6 +212,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ ssl = "";
+#endif
+
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
-@@ -182,10 +194,10 @@ static void print_rsync_version(enum log
+@@ -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, " %sIPv6, %d-bit system inums, %d-bit internal inums\n",
-+ rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums, %sssl\n",
- ipv6,
+- 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 (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());
-@@ -298,6 +310,13 @@ void usage(enum logcode F)
- rprintf(F," -4 --ipv4 prefer IPv4\n");
- rprintf(F," -6 --ipv6 prefer IPv6\n");
+@@ -351,6 +364,13 @@ void usage(enum logcode F)
+ rprintf(F," -4, --ipv4 prefer IPv4\n");
+ rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
-+#ifdef HAVE_OPENSSL
++#if 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");
+#endif
rprintf(F," -h, --help show this help screen\n");
- rprintf(F,"\n");
-@@ -309,7 +328,7 @@ void usage(enum logcode F)
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
+ rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
+@@ -361,7 +381,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_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_USE_SSL,
+- 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[] = {
-@@ -396,6 +415,13 @@ static struct poptOption long_options[]
+@@ -461,6 +481,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
-+#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},
++#if 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},
++ {"ssl-ca-certs", 0, POPT_ARG_STRING, &ssl_ca_path, OPT_USE_SSL, 0, 0},
+#endif
- {0,0,0,0, 0, 0, 0}
- };
-
-@@ -593,6 +619,12 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
+ /* All these 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 },
+@@ -864,6 +891,12 @@ int parse_arguments(int *argc, const cha
+ basis_dir[basis_dir_cnt++] = (char *)arg;
+ break;
+ case OPT_USE_SSL:
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ use_ssl = 1;
+#endif
+ break;
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -732,6 +764,17 @@ int parse_arguments(int *argc, const cha
- if (do_progress && !verbose)
- verbose = 1;
+ * turned this option off. */
+@@ -1112,6 +1145,17 @@ int parse_arguments(int *argc, const cha
+ if (delay_updates && !partial_dir)
+ partial_dir = partialdir_for_delayupdate;
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+ if (use_ssl) {
+ if (init_tls()) {
+ snprintf(err_buf, sizeof(err_buf),
+ }
+#endif
+
- if (bwlimit) {
- bwlimit_writemax = (size_t)bwlimit * 128;
- if (bwlimit_writemax < 512)
---- orig/rsync.h 2004-07-07 08:27:00
-+++ rsync.h 2004-07-03 20:22:28
+ if (inplace) {
+ #ifdef HAVE_FTRUNCATE
+ if (partial_dir) {
+@@ -1479,11 +1523,28 @@ char *check_for_hostspec(char *s, char *
+ {
+ char *p;
+ int not_host;
++ int url_prefix_len = sizeof URL_PREFIX - 1;
+
+- 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 {
++ 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 @@
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define BACKUP_SUFFIX "~"
-@@ -326,6 +327,11 @@ enum msgcode {
- #define uint64 unsigned off_t
+@@ -411,6 +412,11 @@ enum msgcode {
+ # define SIZEOF_INT64 SIZEOF_OFF_T
#endif
+#if HAVE_OPENSSL
/* 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-07-02 21:44:19
-+++ ssl.c 2004-07-02 21:44:19
+--- orig/ssl.c 2004-10-08 19:37:22
++++ ssl.c 2004-10-08 19:37:22
@@ -0,0 +1,366 @@
+/* -*- c-file-style: "linux" -*-
+ * ssl.c: operations for negotiating SSL rsync connections.
+
+#include "rsync.h"
+
-+#ifdef HAVE_SYS_SELECT_H
++#if HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#else
+#include <sys/time.h>
+ */
+static int default_password_cb(char *buf, int n, UNUSED(int f), UNUSED(void *u))
+{
-+ if (ssl_key_passwd == NULL || n < strlen(ssl_key_passwd))
++ if (ssl_key_passwd == NULL || n < (int)strlen(ssl_key_passwd))
+ return 0;
+ strncpy(buf, ssl_key_passwd, n-1);
+ return strlen(ssl_key_passwd);
+/**
+ * If verbose, this method traces the status of the SSL handshake.
+ */
-+static void info_callback(SSL *ssl, int cb, int val)
++static void info_callback(const SSL *ssl, int cb, int val)
+{
+ char buf[128];
+ char *cbs;
+ if (verbose > 2) {
+ 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_CIPHER_description(SSL_get_current_cipher((SSL*)ssl),
+ buf, sizeof buf);
+ rprintf(FLOG, "SSL: cipher: %s", buf);
+ }
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff