From c47adc64de2471d95e923a20676a97674e393c0b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 30 Apr 2007 19:26:42 +0000
Subject: [PATCH] Apply Brian Murrell's ssh-scp patch

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6160 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/shorewall | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index 8cf39710c..b8e9e2cdb 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -1119,8 +1119,7 @@ reload_command() # $* = original arguments less the command.
 	fi
 
 	progress_message "Getting Capabilities on system $system..."
-	if ! ssh ${root}@${system} "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES /usr/share/shorewall-lite/shorecap > ${LITEDIR}/capabilities" || \
-	   ! scp ${root}@$system:${LITEDIR}/capabilities $directory; then
+	if ! ssh ${root}@${system} "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES /usr/share/shorewall-lite/shorecap" > $directory/capabilities; then
 	    fatal_error "ERROR: Capturing capabilities on system $system failed"
 	fi
     fi