TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
---- orig/cleanup.c 2004-10-14 17:11:40
-+++ cleanup.c 2004-07-03 20:22:28
-@@ -24,6 +24,9 @@
+--- orig/cleanup.c 2005-01-10 09:46:11
++++ cleanup.c 2005-01-10 10:43:22
+@@ -22,6 +22,9 @@
+ #include "rsync.h"
+
extern int io_error;
- extern int keep_partial;
- extern int log_got_error;
+#ifdef HAVE_OPENSSL
+extern int use_ssl;
+#endif
-
- /**
- * Close all open sockets and files, allowing a (somewhat) graceful
-@@ -97,6 +100,11 @@ void _exit_cleanup(int code, const char
+ extern int keep_partial;
+ extern int log_got_error;
+ extern char *partial_dir;
+@@ -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);
---- orig/clientserver.c 2004-08-02 02:29:16
+--- orig/clientserver.c 2005-01-25 00:53:58
+++ clientserver.c 2004-10-08 20:44:59
-@@ -46,6 +46,9 @@ extern int io_timeout;
+@@ -47,6 +47,9 @@ extern int select_timeout;
extern int orig_umask;
extern int no_detach;
extern int default_af_hint;
+extern int use_ssl;
+#endif
extern char *bind_address;
- extern struct exclude_list_struct server_exclude_list;
- extern char *exclude_path_prefix;
-@@ -94,8 +97,18 @@ int start_socket_client(char *host, char
+ extern struct filter_list_struct server_filter_list;
+ extern char *config_file;
+@@ -100,8 +103,18 @@ int start_socket_client(char *host, char
exit_cleanup(RERR_SOCKETIO);
ret = start_inband_exchange(user, path, fd, fd, argc);
}
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;
+@@ -162,6 +175,33 @@ int start_inband_exchange(char *user, ch
+ if (verbose > 1)
+ print_child_argv(sargs);
+#ifdef HAVE_OPENSSL
+ if (use_ssl) {
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -178,6 +218,10 @@ int start_inband_exchange(char *user, ch
+@@ -190,6 +230,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);
}
-@@ -185,6 +229,10 @@ int start_inband_exchange(char *user, ch
+@@ -197,6 +241,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);
-@@ -497,6 +545,7 @@ static void send_listing(int fd)
+@@ -519,6 +567,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 */
-@@ -546,6 +595,9 @@ int start_daemon(int f_in, int f_out)
+@@ -568,6 +617,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;
-@@ -555,6 +607,20 @@ int start_daemon(int f_in, int f_out)
+@@ -577,6 +629,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 2004-10-06 00:12:16
+--- orig/configure.in 2005-01-10 00:21:12
+++ 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-11-03 20:30:45
+--- orig/main.c 2005-01-24 01:43:10
+++ main.c 2004-10-08 20:15:28
-@@ -56,6 +56,9 @@ extern int write_batch;
+@@ -57,6 +57,9 @@ extern int write_batch;
extern int batch_fd;
extern int batch_gen_fd;
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -790,33 +793,48 @@ static int start_client(int argc, char *
+@@ -808,33 +811,48 @@ static int start_client(int argc, char *
if ((rc = copy_argv(argv)))
return rc;
p = find_colon(argv[0]);
if (p) { /* source is remote */
if (remote_filesfrom_file
-@@ -848,12 +866,26 @@ static int start_client(int argc, char *
+@@ -866,12 +884,26 @@ 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-11-11 22:13:09
-+++ options.c 2004-11-11 22:21:10
-@@ -136,6 +136,14 @@ int quiet = 0;
+--- orig/options.c 2005-01-25 03:26:51
++++ options.c 2004-11-27 18:31:46
+@@ -144,6 +144,14 @@ int quiet = 0;
int always_checksum = 0;
int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -156,6 +164,7 @@ static void print_rsync_version(enum log
+@@ -166,6 +174,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
-@@ -178,6 +187,10 @@ static void print_rsync_version(enum log
+@@ -188,6 +197,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,
-@@ -191,10 +204,10 @@ static void print_rsync_version(enum log
+@@ -201,10 +214,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, " %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);
+- (int) (sizeof (int64) * 8));
++ (int) (sizeof (int64) * 8), ssl);
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
-@@ -305,6 +318,13 @@ void usage(enum logcode F)
+@@ -325,6 +338,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,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -315,7 +335,7 @@ void usage(enum logcode F)
+@@ -335,7 +355,7 @@ void usage(enum logcode F)
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
+ OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_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[] = {
-@@ -400,6 +420,13 @@ static struct poptOption long_options[]
+@@ -428,6 +448,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
/* 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 },
-@@ -716,6 +743,12 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
+@@ -788,6 +815,12 @@ int parse_arguments(int *argc, const cha
+ basis_dir[basis_dir_cnt++] = (char *)arg;
+ break;
+ case OPT_USE_SSL:
+#ifdef HAVE_OPENSSL
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -897,6 +930,17 @@ int parse_arguments(int *argc, const cha
- if (do_progress && !verbose)
- verbose = 1;
+@@ -995,6 +1028,17 @@ int parse_arguments(int *argc, const cha
+ bwlimit_writemax = 512;
+ }
+#ifdef HAVE_OPENSSL
+ if (use_ssl) {
+ }
+#endif
+
- if (bwlimit) {
- bwlimit_writemax = (size_t)bwlimit * 128;
- if (bwlimit_writemax < 512)
---- orig/rsync.h 2004-11-03 20:30:45
+ if (inplace) {
+ #if HAVE_FTRUNCATE
+ if (partial_dir) {
+--- orig/rsync.h 2005-01-25 00:53:58
+++ rsync.h 2004-10-08 21:01:33
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -338,6 +339,11 @@ enum msgcode {
- #define uint64 unsigned off_t
+@@ -339,6 +340,11 @@ enum msgcode {
+ #define INT64_IS_OFF_T
#endif
+#if HAVE_OPENSSL
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff