Got rid of two compiler warnings.

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

diff --git a/openssl-support.diff b/openssl-support.diff
index a4c2d57..20384f7 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -20,7 +20,7 @@ this implementation are:
 
        #starttls
 
-     And, if the server allows SSL, it replies with
+     And, if the daemon allows SSL, it replies with
 
        @RSYNCD: starttls
 
@@ -223,8 +223,8 @@ 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/options.c     2005-04-09 18:00:28
-+++ options.c  2005-04-09 18:03:00
+--- orig/options.c     2005-05-10 15:32:58
++++ options.c  2005-05-03 16:51:16
 @@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -272,20 +272,20 @@ 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());
-@@ -353,6 +366,13 @@ void usage(enum logcode F)
+@@ -352,6 +365,13 @@ void usage(enum logcode F)
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
 +#if HAVE_OPENSSL
 +  rprintf(F,"     --ssl                   allow socket connections to use SSL\n");
-+  rprintf(F,"     --ssl-cert=FILE         path to server's SSL certificate\n");
-+  rprintf(F,"     --ssl-key=FILE          path to server's SSL private key\n");
++  rprintf(F,"     --ssl-cert=FILE         path to daemon's SSL certificate\n");
++  rprintf(F,"     --ssl-key=FILE          path to daemon's SSL private key\n");
 +  rprintf(F,"     --ssl-key-passwd=PASS   password for PEM-encoded private key\n");
 +  rprintf(F,"     --ssl-ca-certs=FILE     path to trusted CA certificates\n");
 +#endif
+   rprintf(F,"     --version               print version number\n");
    rprintf(F," -h, --help                  show this help screen\n");
  
-   rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
 @@ -364,7 +384,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -309,7 +309,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. */
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
-@@ -873,6 +900,12 @@ int parse_arguments(int *argc, const cha
+@@ -882,6 +909,12 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -322,7 +322,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. */
-@@ -1124,6 +1157,17 @@ int parse_arguments(int *argc, const cha
+@@ -1133,6 +1166,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
  
@@ -340,7 +340,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1493,11 +1537,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1502,11 +1546,28 @@ char *check_for_hostspec(char *s, char *
  {
        char *p;
        int not_host;
@@ -371,7 +371,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                if ((p = strchr(s, '/')) != NULL) {
                        hostlen = p - s;
                        path = p + 1;
---- orig/rsync.h       2005-03-28 20:56:55
+--- orig/rsync.h       2005-05-03 17:11:01
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@
  
@@ -381,7 +381,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -411,6 +412,11 @@ enum msgcode {
+@@ -410,6 +411,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif