From 01306e123087c9d65f0843a87e394ed9fed7339f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 23 Nov 2016 14:48:28 -0800 Subject: [PATCH] Try another approach to the RCP_/RSH_COMMAND formatting issue Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall.conf.xml | 31 ++++++------------------- Shorewall6/manpages/shorewall6.conf.xml | 31 ++++++------------------- 2 files changed, 14 insertions(+), 48 deletions(-) diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index f312995d6..9e63d7181 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -2161,34 +2161,17 @@ LOG:info:,bar net fw The default values for these are as follows: - - RSH_COMMAND: ssh ${root}@${system} ${command} - - RCP_COMMAND: scp ${files} - ${root}@${system}:${destination} - + RSH_COMMAND: ssh ${root}@${system} ${command} +RCP_COMMAND: scp ${files} ${root}@${system}:${destination} Shell variables that will be set when the commands are invoked are as follows: - - root - root user. Normally - but may be overridden using the '-r' - option. - - system - The name/IP address of - the remote firewall system. - - command - For RSH_COMMAND, the - command to be executed on the firewall system. - - files - For RCP_COMMAND, a - space-separated list of files to be copied to the remote firewall - system. - - destination - The directory on - the remote system that the files are to be copied into. - + root - root user. Normally but may be overridden using the '-r' option. +system - The name/IP address of the remote firewall system. +command - For RSH_COMMAND, the command to be executed on the firewall system. +files - For RCP_COMMAND, a space-separated list of files to be copied to the remote firewall system. +destination - The directory on the remote system that the files are to be copied into. diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 361244aff..4662e8a04 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -1886,34 +1886,17 @@ LOG:info:,bar net fw The default values for these are as follows: - - RSH_COMMAND: ssh ${root}@${system} ${command} - - RCP_COMMAND: scp ${files} - ${root}@${system}:${destination} - + RSH_COMMAND: ssh ${root}@${system} ${command} +RCP_COMMAND: scp ${files} ${root}@${system}:${destination} Shell variables that will be set when the commands are invoked are as follows: - - root - root user. Normally - but may be overridden using the '-r' - option. - - system - The name/IP address of - the remote firewall system. - - command - For RSH_COMMAND, the - command to be executed on the firewall system. - - files - For RCP_COMMAND, a - space-separated list of files to be copied to the remote firewall - system. - - destination - The directory on - the remote system that the files are to be copied into. - + root - root user. Normally but may be overridden using the '-r' option. +system - The name/IP address of the remote firewall system. +command - For RSH_COMMAND, the command to be executed on the firewall system. +files - For RCP_COMMAND, a space-separated list of files to be copied to the remote firewall system. +destination - The directory on the remote system that the files are to be copied into.