From 9dea2ae87cd2da25e4f39864808c8f6aeb98086a Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 7 Apr 2020 13:29:29 -0700
Subject: [PATCH] Make use of the new RSYNC_PORT env var.

---
 stunnel-rsync.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/stunnel-rsync.in b/stunnel-rsync.in
index fdd8bfd1..ca702ae9 100755
--- a/stunnel-rsync.in
+++ b/stunnel-rsync.in
@@ -16,14 +16,19 @@ if [ x"$RSYNC_SSL_CERT" = x ]; then
 else
     cert="cert = $RSYNC_SSL_CERT"
 fi
-if [ x"$RSYNC_SSL_CA_CERT" ]; then
+
+if [ x"$RSYNC_SSL_CA_CERT" = x ]; then
     cafile=""
     verify=0
 else
     cafile="CAfile = $RSYNC_SSL_CA_CERT"
     verify=3
 fi
-port=${RSYNC_SSL_PORT:-874}
+
+port="${RSYNC_PORT:-0}"
+if [ "$port" = 0 ]; then
+    port="${RSYNC_SSL_PORT:-874}"
+fi
 
 # If the user specified USER@HOSTNAME::module, then rsync passes us
 # the -l USER option too, so we must be prepared to ignore it.
-- 
2.47.3