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-02-07 20:41:56
+++ 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-01 21:11:00
+ code, safe_fname(file), line);
+--- orig/clientserver.c 2005-02-20 00:02:22
+++ 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 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;
+@@ -102,8 +105,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,
-@@ -154,6 +167,33 @@ int start_inband_exchange(char *user, ch
- if (protocol_version > remote_protocol)
- protocol_version = remote_protocol;
+@@ -164,6 +177,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);
-@@ -182,6 +222,10 @@ int start_inband_exchange(char *user, ch
+@@ -192,6 +232,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);
}
-@@ -189,6 +233,10 @@ int start_inband_exchange(char *user, ch
+@@ -199,6 +243,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);
-@@ -504,6 +552,7 @@ static void send_listing(int fd)
+@@ -536,6 +584,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 */
-@@ -553,6 +602,9 @@ int start_daemon(int f_in, int f_out)
+@@ -585,6 +634,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;
-@@ -562,6 +614,20 @@ int start_daemon(int f_in, int f_out)
+@@ -594,6 +646,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-02-22 00:53:58
+++ 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-17 23:11:45
+--- orig/main.c 2005-02-23 02:57:26
+++ main.c 2004-10-08 20:15:28
@@ -56,6 +56,9 @@ extern int write_batch;
extern int batch_fd;
extern int batch_gen_fd;
extern int filesfrom_fd;
-+#ifdef HAVE_OPENSSL
++#if HAVE_OPENSSL
+extern int use_ssl;
+#endif
extern pid_t cleanup_child_pid;
+ extern struct stats stats;
extern char *files_from;
- extern char *remote_filesfrom_file;
-@@ -805,33 +808,48 @@ static int start_client(int argc, char *
+@@ -838,33 +841,48 @@ static int start_client(int argc, char *
if ((rc = copy_argv(argv)))
return rc;
- *p = '\0';
+ /* rsync:// always uses rsync server over direct socket connection */
+ if (strncasecmp(URL_PREFIX, argv[0], url_prefix_len) != 0) {
-+#ifdef HAVE_OPENSSL
++#if 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;
p = find_colon(argv[0]);
if (p) { /* source is remote */
if (remote_filesfrom_file
-@@ -863,12 +881,26 @@ static int start_client(int argc, char *
+@@ -896,12 +914,26 @@ static int start_client(int argc, char *
argv++;
} else { /* source is local */
am_sender = 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
++#if 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;
p = strchr(host,'/');
if (p) {
*p = '\0';
---- orig/options.c 2005-01-20 23:05:34
+--- orig/options.c 2005-02-23 02:57:26
+++ options.c 2004-11-27 18:31:46
-@@ -141,6 +141,14 @@ int quiet = 0;
+@@ -154,6 +154,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;
-@@ -162,6 +170,7 @@ static void print_rsync_version(enum log
+@@ -179,6 +187,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
-@@ -184,6 +193,10 @@ static void print_rsync_version(enum log
+@@ -201,6 +210,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,
-@@ -197,10 +210,10 @@ static void print_rsync_version(enum log
+@@ -214,10 +227,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());
-@@ -313,6 +326,13 @@ void usage(enum logcode F)
+@@ -346,6 +359,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");
-@@ -324,7 +344,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
- OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
+@@ -356,7 +376,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_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[] = {
-@@ -411,6 +431,13 @@ static struct poptOption long_options[]
+@@ -454,6 +474,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 },
-@@ -751,6 +778,12 @@ int parse_arguments(int *argc, const cha
+@@ -852,6 +879,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). */
-@@ -948,6 +981,17 @@ int parse_arguments(int *argc, const cha
- bwlimit_writemax = 512;
- }
+ * turned this option off. */
+@@ -1118,6 +1151,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-21 00:35:26
+--- orig/rsync.h 2005-02-23 02:57:27
+++ rsync.h 2004-10-08 21:01:33
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -337,6 +338,11 @@ enum msgcode {
- #define INT64_IS_OFF_T
+@@ -400,6 +401,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