Fixed hunk fuzz.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index aa04ccc..16ee103 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -48,7 +48,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
  
---- orig/cleanup.c     2005-01-28 23:01:07
+--- orig/cleanup.c     2005-02-07 20:41:56
 +++ cleanup.c  2005-01-10 10:43:22
 @@ -22,6 +22,9 @@
  #include "rsync.h"
@@ -71,8 +71,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +
        if (verbose > 3) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
-                       code, file, line);
---- orig/clientserver.c        2005-02-01 10:39:22
+                       code, safe_fname(file), line);
+--- orig/clientserver.c        2005-02-07 20:41:56
 +++ clientserver.c     2004-10-08 20:44:59
 @@ -45,6 +45,9 @@ extern int select_timeout;
  extern int orig_umask;
@@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        return RERR_STARTCLIENT;
                } else {
                        rprintf(FINFO,"%s\n", line);
-@@ -523,6 +571,7 @@ static void send_listing(int fd)
+@@ -526,6 +574,7 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  /* 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 */
-@@ -572,6 +621,9 @@ int start_daemon(int f_in, int f_out)
+@@ -575,6 +624,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        line[0] = 0;
        if (!read_line(f_in, line, sizeof line - 1))
                return -1;
-@@ -581,6 +633,20 @@ int start_daemon(int f_in, int f_out)
+@@ -584,6 +636,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -223,9 +223,9 @@ 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-01-30 10:07:21
+--- orig/main.c        2005-02-07 20:41:56
 +++ main.c     2004-10-08 20:15:28
-@@ -56,6 +56,9 @@ extern int write_batch;
+@@ -52,6 +52,9 @@ extern int write_batch;
  extern int batch_fd;
  extern int batch_gen_fd;
  extern int filesfrom_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 char *files_from;
  extern char *remote_filesfrom_file;
-@@ -835,33 +838,48 @@ static int start_client(int argc, char *
+@@ -821,33 +824,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
-@@ -893,12 +911,26 @@ static int start_client(int argc, char *
+@@ -879,12 +897,26 @@ static int start_client(int argc, char *
                        argv++;
                } else { /* source is local */
                        am_sender = 1;
@@ -338,9 +338,9 @@ can't say if I've left any cleanup/compatibility errors in the code.
                                p = strchr(host,'/');
                                if (p) {
                                        *p = '\0';
---- orig/options.c     2005-02-01 10:39:22
+--- orig/options.c     2005-02-11 18:21:45
 +++ options.c  2004-11-27 18:31:46
-@@ -144,6 +144,14 @@ int quiet = 0;
+@@ -143,6 +143,14 @@ int quiet = 0;
  int always_checksum = 0;
  int list_only = 0;
  
@@ -355,7 +355,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  
-@@ -166,6 +174,7 @@ static void print_rsync_version(enum log
+@@ -168,6 +176,7 @@ static void print_rsync_version(enum log
        char const *hardlinks = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
@@ -363,7 +363,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        STRUCT_STAT *dumstat;
  
  #if HAVE_SOCKETPAIR
-@@ -188,6 +197,10 @@ static void print_rsync_version(enum log
+@@ -190,6 +199,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -374,7 +374,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f,
-@@ -201,10 +214,10 @@ static void print_rsync_version(enum log
+@@ -203,10 +216,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. */
@@ -387,7 +387,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
-@@ -331,6 +344,13 @@ void usage(enum logcode F)
+@@ -333,6 +346,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
@@ -401,7 +401,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    rprintf(F," -h, --help                  show this help screen\n");
  
    rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -341,7 +361,7 @@ void usage(enum logcode F)
+@@ -343,7 +363,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -410,7 +410,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -436,6 +456,13 @@ static struct poptOption long_options[] 
+@@ -439,6 +459,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
@@ -424,7 +424,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    /* 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 },
-@@ -802,6 +829,12 @@ int parse_arguments(int *argc, const cha
+@@ -831,6 +858,12 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -436,10 +436,10 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +
                default:
                        /* A large opt value means that set_refuse_options()
-                        * turned this option off (opt-BASE is its index). */
-@@ -1018,6 +1051,17 @@ int parse_arguments(int *argc, const cha
+                        * turned this option off. */
+@@ -1063,6 +1096,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
-               partial_dir = ".~tmp~";
+               partial_dir = partialdir_for_delayupdate;
  
 +#if HAVE_OPENSSL
 +      if (use_ssl) {
@@ -455,7 +455,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #if HAVE_FTRUNCATE
                if (partial_dir) {
---- orig/rsync.h       2005-02-03 02:04:20
+--- orig/rsync.h       2005-02-07 20:41:57
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@
  
@@ -465,7 +465,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -386,6 +387,11 @@ enum msgcode {
+@@ -382,6 +383,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif