tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-06-13 Ramon Novoa <rnovoa@artica.es> 

* pandora_agent: Merged from 4.0 branch. Quote the XML data file name
	  before trying to send it.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-06-13 15:10:53 +00:00
parent 2cd487cd81
commit 237902d689
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,8 @@
2013-06-13 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Merged from 4.0 branch. Quote the XML data file name
before trying to send it.
2013-06-07 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/make_deb_package.sh: Merged from 4.0 branch. Create the agent's

6
pandora_agents/unix/pandora_agent
View File

@ -739,9 +739,9 @@ sub send_file {
my $output;
if ($Conf{'transfer_mode'} eq 'tentacle') {
$output = `tentacle_client -v -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} $file 2>&1 >$DevNull`;
$output = `tentacle_client -v -a $Conf{'server_ip'} -p $Conf{'server_port'} $Conf{'server_opts'} "$file" 2>&1 >$DevNull`;
} elsif ($Conf{'transfer_mode'} eq 'ssh') {
$output = `scp -P $Conf{'server_port'} $file pandora@"$Conf{'server_ip'}:$Conf{'server_path'}" 2>&1 >$DevNull`;
$output = `scp -P $Conf{'server_port'} "$file" pandora@"$Conf{'server_ip'}:$Conf{'server_path'}" 2>&1 >$DevNull`;
} elsif ($Conf{'transfer_mode'} eq 'ftp') {
my $base = basename ($file);
my $dir = dirname ($file);
@ -755,7 +755,7 @@ sub send_file {
quit
FEOF1`
} elsif ($Conf{'transfer_mode'} eq 'local') {
$output = `cp $file $Conf{'server_path'}/ 2>&1 >$DevNull`;
$output = `cp "$file" "$Conf{'server_path'}/" 2>&1 >$DevNull`;
}
# Get the errorlevel