X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=blobdiff_plain;f=openssl-support.diff;fp=openssl-support.diff;h=daa419beb5057d0b89e504fe479f4b3349ae69d7;hp=cc70ab59a1f7c6d276d5a2a0a6d135115dd0ed32;hb=c1ff70aa47e11c5b37634479a0facee775a7b6d9;hpb=8a946eb07a88733c50d91dae467cb139778fd45d

diff --git a/openssl-support.diff b/openssl-support.diff
index cc70ab5..daa419b 100644
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -35,7 +35,7 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -51,9 +51,9 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/cleanup.c b/cleanup.c
 --- a/cleanup.c
 +++ b/cleanup.c
-@@ -27,6 +27,9 @@ extern int am_daemon;
- extern int am_sender;
- extern int am_generator;
+@@ -26,6 +26,9 @@ extern int am_server;
+ extern int am_daemon;
+ extern int am_receiver;
  extern int io_error;
 +#ifdef HAVE_OPENSSL
 +extern int use_ssl;
@@ -61,8 +61,8 @@ diff --git a/cleanup.c b/cleanup.c
  extern int keep_partial;
  extern int got_xfer_error;
  extern int protocol_version;
-@@ -136,6 +139,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
- 				code, file, line);
+@@ -137,6 +140,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
+ 				who_am_i(), code, file, line);
  		}
  
 +#ifdef HAVE_OPENSSL
@@ -198,7 +198,7 @@ diff --git a/clientserver.c b/clientserver.c
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -312,6 +312,21 @@ if test x"$enable_locale" != x"no"; then
+@@ -318,6 +318,21 @@ if test x"$enable_locale" != x"no"; then
  	AC_DEFINE(CONFIG_LOCALE)
  fi
  
@@ -332,7 +332,7 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -1359,6 +1399,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1360,6 +1400,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  					verbose++;
  					break;
  
@@ -345,7 +345,7 @@ diff --git a/options.c b/options.c
  				default:
  					rprintf(FERROR,
  					    "rsync: %s: %s (in daemon mode)\n",
-@@ -1385,6 +1431,17 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1386,6 +1432,17 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  				exit_cleanup(RERR_SYNTAX);
  			}
  
@@ -363,7 +363,7 @@ diff --git a/options.c b/options.c
  			*argv_p = argv = poptGetArgs(pc);
  			*argc_p = argc = count_args(argv);
  			am_starting_up = 0;
-@@ -1763,6 +1820,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1764,6 +1821,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			return 0;
  #endif
  
@@ -376,7 +376,7 @@ diff --git a/options.c b/options.c
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -2145,6 +2208,17 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2160,6 +2223,17 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  	if (delay_updates && !partial_dir)
  		partial_dir = tmp_partialdir;
  
@@ -394,7 +394,7 @@ diff --git a/options.c b/options.c
  	if (inplace) {
  #ifdef HAVE_FTRUNCATE
  		if (partial_dir) {
-@@ -2735,9 +2809,18 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
+@@ -2750,9 +2824,18 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
  {
  	char *path;