can't say if I've left any cleanup/compatibility errors in the code.
---- Makefile.in 2 May 2004 17:04:14 -0000 1.100
-+++ Makefile.in 13 May 2004 19:07:03 -0000
+--- Makefile.in 15 May 2004 00:48:11 -0000 1.101
++++ Makefile.in 4 Jun 2004 05:28:32 -0000
@@ -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 \
TLS_OBJ = tls.o syscall.o lib/permstring.o
--- cleanup.c 13 May 2004 07:08:18 -0000 1.22
-+++ cleanup.c 13 May 2004 19:07:03 -0000
++++ cleanup.c 4 Jun 2004 05:28:32 -0000
@@ -24,6 +24,9 @@
extern int io_error;
extern int keep_partial;
/**
* Close all open sockets and files, allowing a (somewhat) graceful
-@@ -98,6 +101,11 @@ void _exit_cleanup(int code, const char
-
+@@ -99,6 +102,11 @@ void _exit_cleanup(int code, const char
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
-+
+
+#ifdef HAVE_OPENSSL
+ if (use_ssl)
+ end_tls();
+#endif
-
++
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
---- clientserver.c 14 Apr 2004 23:33:34 -0000 1.121
-+++ clientserver.c 13 May 2004 19:07:03 -0000
+ code, file, line);
+--- clientserver.c 15 May 2004 19:31:10 -0000 1.122
++++ clientserver.c 4 Jun 2004 05:28:32 -0000
@@ -46,6 +46,9 @@ extern int io_timeout;
extern int orig_umask;
extern int no_detach;
/* 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 */
-@@ -543,6 +592,20 @@ int start_daemon(int f_in, int f_out)
- send_listing(f_out);
+@@ -544,6 +593,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");
+ continue;
+ }
+#endif
-
++
if (*line == '#') {
/* it's some sort of command that I don't understand */
+ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
--- config.h.in 29 Apr 2004 19:40:39 -0000 1.90
-+++ config.h.in 13 May 2004 19:07:03 -0000
++++ config.h.in 4 Jun 2004 05:28:32 -0000
@@ -167,6 +167,9 @@
/* */
#undef HAVE_OFF64_T
#undef HAVE_READLINK
--- configure.in 30 Apr 2004 18:03:33 -0000 1.196
-+++ configure.in 13 May 2004 19:07:03 -0000
++++ configure.in 4 Jun 2004 05:28:32 -0000
@@ -271,6 +271,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)
---- main.c 10 Feb 2004 03:54:47 -0000 1.192
-+++ main.c 13 May 2004 19:07:03 -0000
+--- main.c 19 May 2004 22:19:19 -0000 1.195
++++ main.c 4 Jun 2004 05:28:33 -0000
@@ -51,6 +51,9 @@ extern int rsync_port;
extern int read_batch;
extern int write_batch;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -701,17 +704,32 @@ static int start_client(int argc, char *
+@@ -705,17 +708,32 @@ static int start_client(int argc, char *
pid_t pid;
int f_in,f_out;
int rc;
p = strchr(host,'/');
if (p) {
*p = 0;
-@@ -760,12 +778,27 @@ static int start_client(int argc, char *
+@@ -764,12 +782,27 @@ static int start_client(int argc, char *
argv++;
} else {
am_sender = 1;
p = strchr(host,'/');
if (p) {
*p = 0;
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 13 May 2004 19:07:04 -0000
-@@ -130,6 +130,14 @@ int quiet = 0;
+--- options.c 27 May 2004 21:51:53 -0000 1.153
++++ options.c 4 Jun 2004 05:28:33 -0000
+@@ -131,6 +131,14 @@ int quiet = 0;
int always_checksum = 0;
int list_only = 0;
#define FIXED_CHECKSUM_SEED 32761
#define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_prefix = NULL;
-@@ -142,13 +150,13 @@ static int modify_window_set;
+@@ -143,13 +151,13 @@ static int modify_window_set;
* address, or a hostname. **/
char *bind_address;
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -167,6 +175,10 @@ static void print_rsync_version(enum log
+@@ -168,6 +176,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
-@@ -180,10 +192,10 @@ static void print_rsync_version(enum log
+@@ -181,10 +193,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());
-@@ -294,6 +306,13 @@ void usage(enum logcode F)
+@@ -296,6 +308,13 @@ void usage(enum logcode F)
rprintf(F," -4 --ipv4 prefer IPv4\n");
rprintf(F," -6 --ipv6 prefer IPv6\n");
#endif
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\n");
-@@ -305,7 +324,7 @@ void usage(enum logcode F)
+@@ -307,7 +326,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,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -390,6 +409,13 @@ static struct poptOption long_options[]
+@@ -393,6 +412,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
{0,0,0,0, 0, 0, 0}
};
-@@ -584,6 +610,12 @@ int parse_arguments(int *argc, const cha
+@@ -592,6 +618,12 @@ int parse_arguments(int *argc, const cha
return 0;
#endif
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -722,6 +754,17 @@ int parse_arguments(int *argc, const cha
-
+@@ -729,6 +761,17 @@ int parse_arguments(int *argc, const cha
if (do_progress && !verbose)
verbose = 1;
-+
+
+#ifdef HAVE_OPENSSL
+ if (use_ssl) {
+ if (init_tls()) {
+ }
+ }
+#endif
-
- if (files_from) {
- char *colon;
---- rsync.h 13 May 2004 18:51:22 -0000 1.203
-+++ rsync.h 13 May 2004 19:07:04 -0000
++
+ if (bwlimit) {
+ bwlimit_writemax = (size_t)bwlimit * 128;
+ if (bwlimit_writemax < 512)
+--- rsync.h 16 May 2004 07:28:24 -0000 1.204
++++ rsync.h 4 Jun 2004 05:28:33 -0000
@@ -32,6 +32,7 @@
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define BACKUP_SUFFIX "~"
-@@ -324,6 +325,11 @@ enum msgcode {
- #else
- /* As long as it gets... */
+@@ -326,6 +327,11 @@ enum msgcode {
#define uint64 unsigned off_t
-+#endif
-+
+ #endif
+
+#if HAVE_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/err.h>
- #endif
-
++#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
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ ssl.c 13 May 2004 19:07:04 -0000
++++ ssl.c 4 Jun 2004 05:28:33 -0000
@@ -0,0 +1,366 @@
+/* -*- c-file-style: "linux" -*-
+ * ssl.c: operations for negotiating SSL rsync connections.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff