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

2010-10-08 Ramon Novoa <rnovoa@artica.es> 

* pandora_agent: Pass server_pwd and server_ssl configuration tokens
	  to tentacle. Fixes bug #3080299.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-10-08 14:04:23 +00:00
parent c550c2a1a3
commit 437873ed32
2 changed files with 11 additions and 0 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 @@
2010-10-08 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Pass server_pwd and server_ssl configuration tokens
to tentacle. Fixes bug #3080299.
2010-10-07 Ramon Novoa <rnovoa@artica.es>
* Linux/pandora_agent.conf: Added an example usage of the

6
pandora_agents/unix/pandora_agent
View File

@ -424,6 +424,12 @@ sub read_config (;$) {
# Set the maximun number of threads
$ThreadSem = Thread::Semaphore->new ($Conf{'agent_threads'}) if defined ($Sem);
# Set tentacle client options
if ($Conf{'transfer_mode'} eq 'tentacle') {
$Conf{'server_opts'} = '-x \'' . $Conf{'server_pwd'} . '\' ' . $Conf{'server_opts'} if ($Conf{'server_pwd'} ne '');
$Conf{'server_opts'} = '-c ' . $Conf{'server_opts'} if ($Conf{'server_ssl'} eq 'yes');
}
close (CONF_FILE);
}