--- a/lib/App/ClusterSSH.pm 2010-06-20 16:06:53.000000000 -0700
+++ b/lib/App/ClusterSSH.pm 2010-06-29 12:16:35.144224152 -0700
@@ -1007,6 +1007,13 @@
my $server=$server_object->get_hostname();
#my ( $username, $server, $port ) = split_hostname($_);
+ # Debian 587378; continue to support --username/-l {username} option
+ # for hostname strings where username is not explictly provided.
+ if (! defined $username || $username eq q{}) {
+ # take the first value returned from split_hostname; i.e.: $username = $config{user} if ( $config{user} );
+ ($username) = split_hostname($_);
+ }
+
my $given_server_name = $server_object->get_givenname();
# see if we can find the hostname - if not, drop it