Updated to apply cleanly.

[rsync.git/patches.git] / openssl-support.diff

diff --git a/openssl-support.diff b/openssl-support.diff
index a4f3c38d84a294d2268ed2f36dd9f34c177caf03..254399638124d153db403128665ba07298410ff0 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -223,7 +223,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  AC_MSG_CHECKING([whether to call shutdown on all sockets])
  case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c        2005-02-27 07:33:41
+--- orig/main.c        2005-02-28 02:16:55
 +++ main.c     2004-10-08 20:15:28
 @@ -56,6 +56,9 @@ extern int write_batch;
  extern int batch_fd;
@@ -235,7 +235,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern pid_t cleanup_child_pid;
  extern struct stats stats;
  extern char *files_from;
-@@ -857,33 +860,48 @@ static int start_client(int argc, char *
+@@ -866,33 +869,48 @@ static int start_client(int argc, char *
        if ((rc = copy_argv(argv)))
                return rc;
  
@@ -308,7 +308,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                p = find_colon(argv[0]);
                if (p) { /* source is remote */
                        if (remote_filesfrom_file
-@@ -915,12 +933,26 @@ static int start_client(int argc, char *
+@@ -924,12 +942,26 @@ static int start_client(int argc, char *
                        argv++;
                } else { /* source is local */
                        am_sender = 1;