Updated to work with latest io.c changes.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index d7966f2..00ea8b5 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -72,17 +72,17 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        code, file, line);
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -45,6 +45,9 @@ extern int io_timeout;
- extern int orig_umask;
- extern int no_detach;
- extern int default_af_hint;
+@@ -34,6 +34,9 @@ extern int am_sender;
+ extern int am_server;
+ extern int am_daemon;
+ extern int am_root;
 +#if HAVE_OPENSSL
 +extern int use_ssl;
 +#endif
- extern char *bind_address;
- extern char *sockopts;
- extern char *config_file;
-@@ -104,8 +107,18 @@ int start_socket_client(char *host, char
+ extern int rsync_port;
+ extern int kluge_around_eof;
+ extern int daemon_over_rsh;
+@@ -109,8 +112,18 @@ int start_socket_client(char *host, char
        set_socket_options(fd, sockopts);
  
        ret = start_inband_exchange(user, path, fd, fd, argc);
@@ -102,7 +102,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  }
  
  int start_inband_exchange(char *user, char *path, int f_in, int f_out, 
-@@ -166,6 +179,33 @@ int start_inband_exchange(char *user, ch
+@@ -171,6 +184,33 @@ int start_inband_exchange(char *user, ch
        if (verbose > 1)
                print_child_argv(sargs);
  
@@ -136,7 +136,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(f_out, "%s\n", path);
-@@ -194,6 +234,10 @@ int start_inband_exchange(char *user, ch
+@@ -199,6 +239,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. */
@@ -147,7 +147,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        exit(0);
                }
  
-@@ -201,6 +245,10 @@ int start_inband_exchange(char *user, ch
+@@ -206,6 +250,10 @@ int start_inband_exchange(char *user, ch
                        rprintf(FERROR, "%s\n", line);
                        /* This is always fatal; the server will now
                         * close the socket. */
@@ -158,7 +158,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        return -1;
                }
  
-@@ -716,6 +764,7 @@ static void send_listing(int fd)
+@@ -722,6 +770,7 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -166,7 +166,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 */
-@@ -768,6 +817,9 @@ int start_daemon(int f_in, int f_out)
+@@ -778,6 +827,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -176,7 +176,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;
-@@ -781,6 +833,20 @@ int start_daemon(int f_in, int f_out)
+@@ -789,6 +841,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -281,7 +281,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +  rprintf(F,"     --ssl-ca-certs=FILE     path to trusted CA certificates\n");
 +#endif
    rprintf(F,"     --version               print version number\n");
-   rprintf(F,"     --help                  show this help screen\n");
+   rprintf(F,"(-h) --help                  show this help (-h works with no other options)\n");
  
 @@ -383,7 +403,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
@@ -306,7 +306,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    /* All the following options switch us into daemon-mode option-parsing. */
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
-@@ -1057,6 +1084,12 @@ int parse_arguments(int *argc, const cha
+@@ -1062,6 +1089,12 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -319,7 +319,7 @@ 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. */
-@@ -1335,6 +1368,17 @@ int parse_arguments(int *argc, const cha
+@@ -1340,6 +1373,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = tmp_partialdir;
  
@@ -337,7 +337,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1746,11 +1790,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1750,11 +1794,28 @@ char *check_for_hostspec(char *s, char *
  {
        char *p;
        int not_host;