can't say if I've left any cleanup/compatibility errors in the code.
---- orig/Makefile.in 2004-11-03 11:56:03
+--- 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
TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
---- orig/cleanup.c 2005-01-10 09:46:11
+--- orig/cleanup.c 2005-03-05 18:58:38
+++ cleanup.c 2005-01-10 10:43:22
@@ -22,6 +22,9 @@
#include "rsync.h"
extern int io_error;
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+extern int use_ssl;
+#endif
extern int keep_partial;
extern int log_got_error;
extern char *partial_dir;
-@@ -98,6 +101,11 @@ void _exit_cleanup(int code, const char
+@@ -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 2005-01-25 00:53:58
+ code, safe_fname(file), line);
+--- orig/clientserver.c 2005-03-01 03:39:32
+++ clientserver.c 2004-10-08 20:44:59
-@@ -47,6 +47,9 @@ extern int select_timeout;
+@@ -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 struct filter_list_struct server_filter_list;
extern char *config_file;
-@@ -100,8 +103,18 @@ int start_socket_client(char *host, char
+@@ -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,
-@@ -162,6 +175,33 @@ int start_inband_exchange(char *user, ch
+@@ -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) {
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -190,6 +230,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);
}
-@@ -197,6 +241,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);
-@@ -519,6 +567,7 @@ static void send_listing(int fd)
+@@ -549,6 +597,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 */
-@@ -568,6 +617,9 @@ int start_daemon(int f_in, int f_out)
+@@ -598,6 +647,9 @@ int start_daemon(int f_in, int f_out)
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
line[0] = 0;
if (!read_line(f_in, line, sizeof line - 1))
return -1;
-@@ -577,6 +629,20 @@ int start_daemon(int f_in, int f_out)
+@@ -607,6 +659,20 @@ int start_daemon(int f_in, int f_out)
return -1;
}
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-01-10 00:21:12
+--- orig/configure.in 2005-03-16 02:19:29.819770817
+++ configure.in 2004-07-03 20:22:28
@@ -271,6 +271,21 @@ yes
AC_SEARCH_LIBS(getaddrinfo, inet6)
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c 2005-01-24 01:43:10
-+++ main.c 2004-10-08 20:15:28
-@@ -57,6 +57,9 @@ extern int write_batch;
- extern int batch_fd;
- extern int batch_gen_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;
-@@ -808,33 +811,48 @@ static int start_client(int argc, char *
- if ((rc = copy_argv(argv)))
- return rc;
-
-- /* rsync:// always uses rsync server over direct socket connection */
-- if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0
-- && !read_batch) {
-- char *host, *path;
-+ if (!read_batch) { /* for read_batch, NO source is specified */
-+ int url_prefix_len = sizeof URL_PREFIX - 1;
-
-- host = argv[0] + strlen(URL_PREFIX);
-- p = strchr(host,'/');
-- if (p) {
-- *p = '\0';
-- path = p+1;
-- } else
-- path = "";
-- if (*host == '[' && (p = strchr(host, ']')) != NULL) {
-- host++;
-- *p++ = '\0';
-- if (*p != ':')
-- p = NULL;
-- } else
-- p = strchr(host, ':');
-- if (p) {
-- rsync_port = atoi(p+1);
-- *p = '\0';
-+ /* rsync:// always uses rsync server over direct socket connection */
-+ if (strncasecmp(URL_PREFIX, argv[0], url_prefix_len) != 0) {
-+#ifdef HAVE_OPENSSL
-+ url_prefix_len = sizeof SSL_URL_PREFIX - 1;
-+ if (strncasecmp(SSL_URL_PREFIX, argv[0], 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 *host, *path;
-+
-+ host = argv[0] + url_prefix_len;
-+ p = strchr(host,'/');
-+ if (p) {
-+ *p = '\0';
-+ path = p+1;
-+ } else
-+ path = "";
-+ if (*host == '[' && (p = strchr(host, ']')) != NULL) {
-+ host++;
-+ *p++ = '\0';
-+ if (*p != ':')
-+ p = NULL;
-+ } else
-+ p = strchr(host, ':');
-+ if (p) {
-+ rsync_port = atoi(p+1);
-+ *p = '\0';
-+ }
-+ return start_socket_client(host, path, argc-1, argv+1);
- }
-- return start_socket_client(host, path, argc-1, argv+1);
-- }
-
-- if (!read_batch) { /* for read_batch, NO source is specified */
- p = find_colon(argv[0]);
- if (p) { /* source is remote */
- if (remote_filesfrom_file
-@@ -866,12 +884,26 @@ static int start_client(int argc, char *
- argv++;
- } else { /* source is local */
- am_sender = 1;
--
-+ url_prefix_len = sizeof URL_PREFIX - 1;
- /* rsync:// destination uses rsync server over direct socket */
-- if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) {
-+ if (strncasecmp(URL_PREFIX, argv[argc-1], url_prefix_len) != 0) {
-+#ifdef HAVE_OPENSSL
-+ url_prefix_len = sizeof SSL_URL_PREFIX - 1;
-+ if (strncasecmp(SSL_URL_PREFIX, argv[argc-1], 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 *host, *path;
-
-- host = argv[argc-1] + strlen(URL_PREFIX);
-+ host = argv[argc-1] + url_prefix_len;
- p = strchr(host,'/');
- if (p) {
- *p = '\0';
---- orig/options.c 2005-01-25 03:26:51
-+++ options.c 2004-11-27 18:31:46
-@@ -144,6 +144,14 @@ int quiet = 0;
+--- orig/options.c 2005-03-16 02:19:30.152741841
++++ options.c 2005-03-01 01:34:42
+@@ -157,6 +157,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;
-@@ -166,6 +174,7 @@ static void print_rsync_version(enum log
+@@ -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
-@@ -188,6 +197,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,
-@@ -201,10 +214,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. */
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
-@@ -325,6 +338,13 @@ void usage(enum logcode F)
+@@ -349,6 +362,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");
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -335,7 +355,7 @@ void usage(enum logcode F)
+@@ -359,7 +379,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_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -428,6 +448,13 @@ static struct poptOption long_options[]
+@@ -458,6 +478,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
++#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},
/* 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 },
-@@ -788,6 +815,12 @@ int parse_arguments(int *argc, const cha
+@@ -862,6 +889,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). */
-@@ -995,6 +1028,17 @@ int parse_arguments(int *argc, const cha
- bwlimit_writemax = 512;
- }
+ * turned this option off. */
+@@ -1116,6 +1149,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 (inplace) {
- #if HAVE_FTRUNCATE
+ #ifdef HAVE_FTRUNCATE
if (partial_dir) {
---- orig/rsync.h 2005-01-25 00:53:58
+@@ -1483,11 +1527,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-16 02:19:30.524709471
+++ rsync.h 2004-10-08 21:01:33
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -339,6 +340,11 @@ enum msgcode {
- #define INT64_IS_OFF_T
+@@ -411,6 +412,11 @@ enum msgcode {
+ # define SIZEOF_INT64 SIZEOF_OFF_T
#endif
+#if HAVE_OPENSSL
+
+#include "rsync.h"
+
-+#ifdef HAVE_SYS_SELECT_H
++#if HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#else
+#include <sys/time.h>
git.samba.org / rsync-patches.git / blobdiff