Updated to apply cleanly.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index 708ae3d414339ebba6791cb7127d9d0d44185f68..6f86cf516d356c84c9492e9086adc77ecaa390fc 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -83,9 +83,9 @@ To use this patch, run these commands for a successful build:
 +extern int use_ssl;
 +#endif
  extern int rsync_port;
+ extern int ignore_errors;
  extern int kluge_around_eof;
- extern int daemon_over_rsh;
-@@ -106,8 +109,18 @@ int start_socket_client(char *host, char
+@@ -107,8 +110,18 @@ int start_socket_client(char *host, char
        set_socket_options(fd, sockopts);
  
        ret = start_inband_exchange(user, path, fd, fd, argc);
@@ -105,7 +105,7 @@ To use this patch, run these commands for a successful build:
  }
  
  int start_inband_exchange(const char *user, char *path, int f_in, int f_out,
-@@ -168,6 +181,33 @@ int start_inband_exchange(const char *us
+@@ -169,6 +182,33 @@ int start_inband_exchange(const char *us
        if (verbose > 1)
                print_child_argv(sargs);
  
@@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build:
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(f_out, "%s\n", path);
-@@ -196,6 +236,10 @@ int start_inband_exchange(const char *us
+@@ -197,6 +237,10 @@ int start_inband_exchange(const char *us
                         * server to terminate the listing of modules.
                         * We don't want to go on and transfer
                         * anything; just exit. */
@@ -150,7 +150,7 @@ To use this patch, run these commands for a successful build:
                        exit(0);
                }
  
-@@ -203,6 +247,10 @@ int start_inband_exchange(const char *us
+@@ -204,6 +248,10 @@ int start_inband_exchange(const char *us
                        rprintf(FERROR, "%s\n", line);
                        /* This is always fatal; the server will now
                         * close the socket. */
@@ -161,7 +161,7 @@ To use this patch, run these commands for a successful build:
                        return -1;
                }
  
-@@ -780,6 +828,9 @@ int start_daemon(int f_in, int f_out)
+@@ -785,6 +833,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -171,7 +171,7 @@ To use this patch, run these commands for a successful build:
        line[0] = 0;
        if (!read_line(f_in, line, sizeof line - 1))
                return -1;
-@@ -791,6 +842,20 @@ int start_daemon(int f_in, int f_out)
+@@ -796,6 +847,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -218,7 +218,7 @@ To use this patch, run these commands for a successful build:
        *cygwin* ) AC_MSG_RESULT(yes)
 --- old/options.c
 +++ new/options.c
-@@ -173,6 +173,14 @@ int logfile_format_has_o_or_i = 0;
+@@ -172,6 +172,14 @@ int logfile_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
  
@@ -328,7 +328,7 @@ To use this patch, run these commands for a successful build:
    {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
    {"no-verbose",       0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
    {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
-@@ -853,6 +894,12 @@ int parse_arguments(int *argc, const cha
+@@ -855,6 +896,12 @@ int parse_arguments(int *argc, const cha
                                        verbose++;
                                        break;
  
@@ -341,7 +341,7 @@ To use this patch, run these commands for a successful build:
                                default:
                                        rprintf(FERROR,
                                            "rsync: %s: %s (in daemon mode)\n",
-@@ -876,6 +923,17 @@ int parse_arguments(int *argc, const cha
+@@ -878,6 +925,17 @@ int parse_arguments(int *argc, const cha
                                exit_cleanup(RERR_SYNTAX);
                        }
  
@@ -359,7 +359,7 @@ To use this patch, run these commands for a successful build:
                        *argv = poptGetArgs(pc);
                        *argc = count_args(*argv);
                        am_starting_up = 0;
-@@ -1087,6 +1145,12 @@ int parse_arguments(int *argc, const cha
+@@ -1093,6 +1151,12 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -372,7 +372,7 @@ To use this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1359,6 +1423,17 @@ int parse_arguments(int *argc, const cha
+@@ -1371,6 +1435,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = tmp_partialdir;
  
@@ -390,7 +390,7 @@ To use this patch, run these commands for a successful build:
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1783,10 +1858,27 @@ char *check_for_hostspec(char *s, char *
+@@ -1798,10 +1873,27 @@ char *check_for_hostspec(char *s, char *
        char *p;
        int not_host;
        int hostlen;
@@ -430,7 +430,7 @@ To use this patch, run these commands for a successful build:
  
  #define BACKUP_SUFFIX "~"
  
-@@ -420,6 +421,11 @@ enum msgcode {
+@@ -473,6 +474,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif