Allow multiple concurrent control masters, and allow spaces in path, enhances #169

5 years ago · 219067be26
parent 8f85d20a68
commit 219067be26
1 changed files with 1 additions and 1 deletions
--- 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