can't say if I've left any cleanup/compatibility errors in the code.
---- orig/Makefile.in 2004-05-15 00:53:53
+--- orig/Makefile.in 2004-07-04 08:59:17
+++ 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
TLS_OBJ = tls.o syscall.o lib/permstring.o
---- orig/cleanup.c 2004-07-02 18:11:26
+--- orig/cleanup.c 2004-07-29 16:08:03
+++ cleanup.c 2004-07-03 20:22:28
@@ -24,6 +24,9 @@
extern int io_error;
/**
* Close all open sockets and files, allowing a (somewhat) graceful
-@@ -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);
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
---- orig/clientserver.c 2004-06-18 15:59:19
+--- orig/clientserver.c 2004-08-02 02:29:16
+++ clientserver.c 2004-07-03 20:22:28
@@ -46,6 +46,9 @@ extern int io_timeout;
extern int orig_umask;
extern char *bind_address;
extern struct exclude_list_struct server_exclude_list;
extern char *exclude_path_prefix;
-@@ -93,8 +96,18 @@ int start_socket_client(char *host, char
+@@ -94,8 +97,18 @@ int start_socket_client(char *host, char
exit_cleanup(RERR_SOCKETIO);
ret = start_inband_exchange(user, path, fd, fd, argc);
+ return client_run(fd, fd, -1, argc, argv);
}
- int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
-@@ -148,6 +161,33 @@ int start_inband_exchange(char *user, ch
+ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
+@@ -150,6 +163,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);
-@@ -176,6 +216,10 @@ int start_inband_exchange(char *user, ch
+@@ -178,6 +218,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);
}
-@@ -183,6 +227,10 @@ int start_inband_exchange(char *user, ch
+@@ -185,6 +229,10 @@ int start_inband_exchange(char *user, ch
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
return RERR_STARTCLIENT;
} else {
rprintf(FINFO,"%s\n", line);
-@@ -487,6 +535,7 @@ static void send_listing(int fd)
+@@ -497,6 +545,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 */
-@@ -544,6 +593,20 @@ int start_daemon(int f_in, int f_out)
- return -1;
- }
+@@ -555,6 +604,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");
-+ if (start_tls(f_in, f_out)) {
-+ rprintf(FLOG, "SSL connection failed: %s\n",
-+ get_ssl_error());
-+ return -1;
-+ }
-+ f_in = get_tls_rfd();
-+ f_out = get_tls_wfd();
-+ continue;
++ if (use_ssl && strcmp(line, "#starttls") == 0) {
++ io_printf(f_out, "@RSYNCD: starttls\n");
++ if (start_tls(f_in, f_out)) {
++ rprintf(FLOG, "SSL connection failed: %s\n",
++ get_ssl_error());
++ return -1;
+ }
++ f_in = get_tls_rfd();
++ f_out = get_tls_wfd();
++ 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);
---- orig/configure.in 2004-04-30 18:04:07
+ 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 2004-08-02 21:56: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 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;
+--- orig/main.c 2004-07-31 16:41:04
++++ main.c 2004-07-15 02:40:51
+@@ -56,6 +56,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;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -719,17 +722,32 @@ static int start_client(int argc, char *
+@@ -757,18 +760,32 @@ static int start_client(int argc, char *
pid_t pid;
int f_in,f_out;
int rc;
if ((rc = copy_argv(argv)))
return rc;
-+ if (strncasecmp(URL_PREFIX, argv[0], url_prefix) != 0) {
++ if (strncasecmp(URL_PREFIX, argv[0], url_prefix) != 0 && !read_batch) {
+#ifdef HAVE_OPENSSL
+ url_prefix = strlen(SSL_URL_PREFIX);
+ if (strncasecmp(SSL_URL_PREFIX, argv[0], url_prefix) != 0)
+#endif
+ }
/* rsync:// always uses rsync server over direct socket connection */
-- if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
+- if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0
+- && !read_batch) {
+ if (url_prefix) {
char *host, *path;
p = strchr(host,'/');
if (p) {
*p = 0;
-@@ -777,12 +795,27 @@ static int start_client(int argc, char *
+@@ -816,12 +833,27 @@ static int start_client(int argc, char *
argv++;
} else { /* source is local */
am_sender = 1;
p = strchr(host,'/');
if (p) {
*p = 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;
+--- orig/options.c 2004-08-03 15:41:32
++++ options.c 2004-07-16 20:19:50
+@@ -136,6 +136,14 @@ int quiet = 0;
int always_checksum = 0;
int list_only = 0;
+char *ssl_ca_path = NULL;
+#endif
+
- #define FIXED_CHECKSUM_SEED 32761
- #define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */
- char *batch_prefix = NULL;
-@@ -145,13 +153,13 @@ static int modify_window_set;
- * address, or a hostname. **/
- char *bind_address;
+ #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
+ char *batch_name = NULL;
--
- static void print_rsync_version(enum logcode f)
- {
- char const *got_socketpair = "no ";
+@@ -155,6 +163,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
-@@ -170,6 +178,10 @@ static void print_rsync_version(enum log
+@@ -177,6 +186,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,
-@@ -183,10 +195,10 @@ static void print_rsync_version(enum log
+@@ -190,10 +203,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. */
-- rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n",
-+ rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums, %sssl\n",
- ipv6,
+- rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n",
++ rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums, %sssl\n",
+ have_inplace, ipv6,
(int) (sizeof dumstat->st_ino * 8),
- (int) (sizeof (uint64) * 8));
+ (int) (sizeof (uint64) * 8), ssl);
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
-@@ -299,6 +311,13 @@ void usage(enum logcode F)
- rprintf(F," -4 --ipv4 prefer IPv4\n");
- rprintf(F," -6 --ipv6 prefer IPv6\n");
+@@ -309,6 +322,13 @@ void usage(enum logcode F)
+ rprintf(F," -4, --ipv4 prefer IPv4\n");
+ rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
+#ifdef HAVE_OPENSSL
+ rprintf(F," --ssl allow socket connections to use SSL\n");
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\n");
-@@ -310,7 +329,7 @@ void usage(enum logcode F)
+@@ -320,7 +340,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[] = {
-@@ -397,6 +416,13 @@ static struct poptOption long_options[]
+@@ -409,6 +429,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}
};
-@@ -596,6 +622,12 @@ int parse_arguments(int *argc, const cha
+@@ -618,6 +645,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). */
-@@ -733,6 +765,17 @@ int parse_arguments(int *argc, const cha
+@@ -809,6 +842,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)
---- orig/rsync.h 2004-05-16 07:58:12
+--- orig/rsync.h 2004-08-03 15:41:32
+++ rsync.h 2004-07-03 20:22:28
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -326,6 +327,11 @@ enum msgcode {
+@@ -329,6 +330,11 @@ enum msgcode {
#define uint64 unsigned off_t
#endif
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff