Francois Gouget : testbot/TestAgent: Small fixes in the authentication data setup.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: f49d5bd90360276afbea2603f398a5850d29bf01
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=f49d5bd90360276afbea2603f...

Author: Francois Gouget 
Date:   Tue Dec 11 17:46:17 2012 +0100

testbot/TestAgent: Small fixes in the authentication data setup.

We don't allow interactive login methods so there's no point merging the 'interact' setting from the configuration defaults.
Also Net::SSH2 does not like getting undefined settings so don't override potentially defined values with undefined ones.

---

testbot/lib/WineTestBot/TestAgent.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 92d20bb..e04827a 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -798,9 +798,9 @@ sub _Connect($)
     my $Tunnel = $self->{tunnel};
     my %AuthOptions=(username => $Tunnel->{username} || $ENV{USER});
     foreach my $Key ("username", "password", "publickey", "privatekey",
-                     "hostname", "local_username", "interact")
+                     "hostname", "local_username")
     {
-      $AuthOptions{$Key} = $Tunnel->{$Key} if (exists $Tunnel->{$Key});
+      $AuthOptions{$Key} = $Tunnel->{$Key} if (defined $Tunnel->{$Key});
     }
     # Interactive authentication makes no sense with automatic reconnects
     $AuthOptions{interact} = 0;