Refer to an rsync daemon as a "daemon", not a "server".

diff --git a/openssl-support.diff b/openssl-support.diff
index a7d47f0..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,7 +223,7 @@ 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-05-03 16:47:32
+--- 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;
@@ -278,8 +278,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #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
@@ -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-04-14 01:53:12
+--- orig/rsync.h       2005-05-03 17:11:01
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@