--- Makefile.in 15 May 2004 00:48:11 -0000 1.101
-+++ Makefile.in 6 Jun 2004 21:26:59 -0000
++++ Makefile.in 30 Jun 2004 00:11:17 -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 6 Jun 2004 21:26:59 -0000
++++ cleanup.c 30 Jun 2004 00:11:17 -0000
@@ -24,6 +24,9 @@
extern int io_error;
extern int keep_partial;
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
---- clientserver.c 5 Jun 2004 19:59:03 -0000 1.123
-+++ clientserver.c 6 Jun 2004 21:26:59 -0000
+--- clientserver.c 13 Jun 2004 14:18:48 -0000 1.127
++++ clientserver.c 30 Jun 2004 00:11:17 -0000
@@ -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)
-@@ -147,6 +160,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);
-@@ -175,6 +215,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);
}
-@@ -182,6 +226,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);
-@@ -481,6 +529,7 @@ static void send_listing(int fd)
+@@ -487,6 +535,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 */
-@@ -538,6 +587,20 @@ int start_daemon(int f_in, int f_out)
+@@ -544,6 +593,20 @@ int start_daemon(int f_in, int f_out)
return -1;
}
/* 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 6 Jun 2004 21:26:59 -0000
++++ config.h.in 30 Jun 2004 00:11:17 -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 6 Jun 2004 21:26:59 -0000
++++ configure.in 30 Jun 2004 00:11:17 -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 19 May 2004 22:19:19 -0000 1.195
-+++ main.c 6 Jun 2004 21:27:00 -0000
-@@ -51,6 +51,9 @@ extern int rsync_port;
+--- main.c 28 Jun 2004 17:45:40 -0000 1.201
++++ main.c 30 Jun 2004 00:11:17 -0000
+@@ -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 6 Jun 2004 19:02:40 -0000 1.155
-+++ options.c 6 Jun 2004 21:27:00 -0000
+--- options.c 20 Jun 2004 19:47:05 -0000 1.157
++++ options.c 30 Jun 2004 00:11:18 -0000
@@ -133,6 +133,14 @@ int quiet = 0;
int always_checksum = 0;
int list_only = 0;
{0,0,0,0, 0, 0, 0}
};
-@@ -601,6 +627,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). */
-@@ -738,6 +770,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;
bwlimit_writemax = (size_t)bwlimit * 128;
if (bwlimit_writemax < 512)
--- rsync.h 16 May 2004 07:28:24 -0000 1.204
-+++ rsync.h 6 Jun 2004 21:27:00 -0000
++++ rsync.h 30 Jun 2004 00:11:18 -0000
@@ -32,6 +32,7 @@
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
* 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 6 Jun 2004 21:27:00 -0000
++++ ssl.c 30 Jun 2004 00:11:18 -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