The branch, master has been updated
via 62327b1 We need a trailing dot when using --server --daemon.
via 99c9520 Look for REMOTE_HOST before SSH_* environment options.
from 01959d6 Set DESTDIR for make install.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 62327b1281be9151423048235573e0ca208fc095
Author: Wayne Davison <way...@samba.org>
Date: Fri Jul 12 15:28:54 2013 -0700
We need a trailing dot when using --server --daemon.
commit 99c9520ea735d3fa72721c534a5e3b25751e0203
Author: Wayne Davison <way...@samba.org>
Date: Fri Jul 12 15:24:58 2013 -0700
Look for REMOTE_HOST before SSH_* environment options.
-----------------------------------------------------------------------
Summary of changes:
clientname.c | 6 +++---
stunnel-rsync.in | 4 ++--
stunnel-rsyncd.conf.in | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/clientname.c b/clientname.c
index d085fc7..935d2d6 100644
--- a/clientname.c
+++ b/clientname.c
@@ -50,10 +50,10 @@ char *client_addr(int fd)
if (am_server) { /* daemon over --rsh mode */
char *env_str;
strlcpy(addr_buf, "0.0.0.0", sizeof addr_buf);
- if ((env_str = getenv("SSH_CONNECTION")) != NULL
+ if ((env_str = getenv("REMOTE_HOST")) != NULL
+ || (env_str = getenv("SSH_CONNECTION")) != NULL
|| (env_str = getenv("SSH_CLIENT")) != NULL
- || (env_str = getenv("SSH2_CLIENT")) != NULL
- || (env_str = getenv("REMOTE_HOST")) != NULL) {
+ || (env_str = getenv("SSH2_CLIENT")) != NULL) {
char *p;
strlcpy(addr_buf, env_str, sizeof addr_buf);
/* Truncate the value to just the IP address. */
diff --git a/stunnel-rsync.in b/stunnel-rsync.in
index f206b93..fdd8bfd 100755
--- a/stunnel-rsync.in
+++ b/stunnel-rsync.in
@@ -1,11 +1,11 @@
#!/bin/bash
-# This must be called as:
+# This must be called as (note the trailing dot):
#
# stunnel-rsync HOSTNAME rsync --server --daemon .
#
# ... which is typically done via the rsync-ssl script, which results in
something like this:
#
-# rsync --rsh=stunnel-rsync -aiv HOSTNAME::module ...
+# rsync --rsh=stunnel-rsync -aiv HOSTNAME::module [ARGS]
#
# This SSL setup based on the files by:
http://dozzie.jarowit.net/trac/wiki/RsyncSSL
# Note that this requires at least version 4.x of stunnel.
diff --git a/stunnel-rsyncd.conf.in b/stunnel-rsyncd.conf.in
index 202c9ed..fd28d5d 100644
--- a/stunnel-rsyncd.conf.in
+++ b/stunnel-rsyncd.conf.in
@@ -26,5 +26,5 @@ CAfile = /etc/ssl/ca-bundle.pem
exec = @bindir@/rsync
# You can either share the same config as a normal daemon, or specify a
separate config:
-execargs = rsync --server --daemon
-#execargs = rsync --server --daemon --config=/etc/rsync-ssl/rsyncd.conf
+execargs = rsync --server --daemon .
+#execargs = rsync --server --daemon --config=/etc/rsync-ssl/rsyncd.conf .
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
