From 437873ed3209e9b50af56dd018090bbfc1dc08fb Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 8 Oct 2010 14:04:23 +0000 Subject: [PATCH] 2010-10-08 Ramon Novoa * 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 --- pandora_agents/unix/ChangeLog | 5 +++++ pandora_agents/unix/pandora_agent | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 13b743fda6..7316e9ca1f 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2010-10-08 Ramon Novoa + + * pandora_agent: Pass server_pwd and server_ssl configuration tokens + to tentacle. Fixes bug #3080299. + 2010-10-07 Ramon Novoa * Linux/pandora_agent.conf: Added an example usage of the diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index a281d3b9ae..3ef43d6aa4 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -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); }