From 219067be263b5f21ccbb5fd1f8643aab42354604 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Fri, 5 Jul 2019 22:30:10 +0200
Subject: [PATCH] Allow multiple concurrent control masters, and allow spaces
 in path, enhances #169

---
 dev/ofunctions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh
index 4fd137b..6f2144a 100644
--- a/dev/ofunctions.sh
+++ b/dev/ofunctions.sh
@@ -2031,7 +2031,7 @@ function PreInit {
 
 	## SSH ControlMaster Multiplexing
 	if [ "$SSH_CONTROLMASTER" == true ]; then
-		SSH_OPTS="$SSH_OPTS -o ControlMaster=auto -o ControlPersist=yes -o ControlPath=$RUN_DIR/%r@%h"
+		SSH_OPTS="$SSH_OPTS -o ControlMaster=auto -o ControlPersist=yes -o ControlPath=\"$RUN_DIR/$PROGRAM.ctrlm.%r@%h.$SCRIPT_PID.$TSTAMP\""
 	fi
 
 	## Support for older config files without RSYNC_EXECUTABLE option