can't say if I've left any cleanup/compatibility errors in the code.
---- Makefile.in 15 May 2004 00:48:11 -0000 1.101
-+++ Makefile.in 4 Jun 2004 05:28:32 -0000
+--- orig/Makefile.in 2004-05-15 00:53:53
++++ Makefile.in 2004-07-03 20:22:28
@@ -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 4 Jun 2004 05:28:32 -0000
+--- 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;
/**
* Close all open sockets and files, allowing a (somewhat) graceful
-@@ -99,6 +102,11 @@ void _exit_cleanup(int code, const char
+@@ -98,6 +101,11 @@ void _exit_cleanup(int code, const char
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
---- clientserver.c 15 May 2004 19:31:10 -0000 1.122
-+++ clientserver.c 4 Jun 2004 05:28:32 -0000
+--- orig/clientserver.c 2004-06-18 15:59:19
++++ clientserver.c 2004-07-03 20:22:28
@@ -46,6 +46,9 @@ extern int io_timeout;
extern int orig_umask;
extern int no_detach;
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
-@@ -145,6 +158,33 @@ int start_inband_exchange(char *user, ch
+@@ -148,6 +161,33 @@ int start_inband_exchange(char *user, ch
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -172,6 +212,10 @@ int start_inband_exchange(char *user, ch
+@@ -176,6 +216,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. */
exit(0);
}
-@@ -179,6 +223,10 @@ int start_inband_exchange(char *user, ch
- rprintf(FERROR,"%s\n", line);
+@@ -183,6 +227,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
return RERR_STARTCLIENT;
} else {
rprintf(FINFO,"%s\n", line);
-@@ -485,6 +533,7 @@ static void send_listing(int fd)
+@@ -487,6 +535,7 @@ static void send_listing(int fd)
io_printf(fd,"@RSYNCD: EXIT\n");
}
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 4 Jun 2004 05:28:32 -0000
-@@ -167,6 +167,9 @@
- /* */
- #undef HAVE_OFF64_T
-
-+/* true if you want to use SSL. */
-+#undef HAVE_OPENSSL
-+
- /* Define to 1 if you have the `readlink' function. */
- #undef HAVE_READLINK
-
---- configure.in 30 Apr 2004 18:03:33 -0000 1.196
-+++ configure.in 4 Jun 2004 05:28:32 -0000
+--- orig/configure.in 2004-04-30 18:04:07
++++ configure.in 2004-07-03 20:22:28
@@ -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 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;
+--- orig/main.c 2004-06-30 07:24:30
++++ main.c 2004-07-03 20:22:28
+@@ -52,6 +52,9 @@ extern int rsync_port;
extern int read_batch;
extern int write_batch;
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -705,17 +708,32 @@ static int start_client(int argc, char *
+@@ -719,17 +722,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;
-@@ -764,12 +782,27 @@ static int start_client(int argc, char *
+@@ -777,12 +795,27 @@ static int start_client(int argc, char *
argv++;
- } else {
+ } else { /* source is local */
am_sender = 1;
+ url_prefix = strlen(URL_PREFIX);
+ if (strncasecmp(URL_PREFIX, argv[0], url_prefix) != 0) {
p = strchr(host,'/');
if (p) {
*p = 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;
+--- orig/options.c 2004-06-20 19:30:00
++++ options.c 2004-07-03 20:22:28
+@@ -133,6 +133,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;
-@@ -143,13 +151,13 @@ static int modify_window_set;
+@@ -145,13 +153,13 @@ static int modify_window_set;
* address, or a hostname. **/
char *bind_address;
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -168,6 +176,10 @@ static void print_rsync_version(enum log
+@@ -170,6 +178,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,
-@@ -181,10 +193,10 @@ static void print_rsync_version(enum log
+@@ -183,10 +195,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());
-@@ -296,6 +308,13 @@ void usage(enum logcode F)
+@@ -299,6 +311,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");
-@@ -307,7 +326,7 @@ void usage(enum logcode F)
+@@ -310,7 +329,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_READ_BATCH, OPT_WRITE_BATCH,
-+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_USE_SSL,
+- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
++ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_USE_SSL,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -393,6 +412,13 @@ static struct poptOption long_options[]
+@@ -397,6 +416,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}
};
-@@ -592,6 +618,12 @@ int parse_arguments(int *argc, const cha
+@@ -596,6 +622,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). */
-@@ -729,6 +761,17 @@ int parse_arguments(int *argc, const cha
+@@ -733,6 +765,17 @@ int parse_arguments(int *argc, const cha
if (do_progress && !verbose)
verbose = 1;
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
+--- orig/rsync.h 2004-05-16 07:58:12
++++ rsync.h 2004-07-03 20:22:28
@@ -32,6 +32,7 @@
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
/* 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 4 Jun 2004 05:28:33 -0000
+--- orig/ssl.c 2004-07-02 21:44:19
++++ ssl.c 2004-07-02 21:44:19
@@ -0,0 +1,366 @@
+/* -*- c-file-style: "linux" -*-
+ * ssl.c: operations for negotiating SSL rsync connections.
git.samba.org / rsync-patches.git / blobdiff