amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-07-03 09:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct id reference in servers hash

Browse source
This commit is contained in:
duncan_ferguson 2009-04-08 17:56:38 +00:00
parent 8cbdcb88a9
commit 1d85a21872
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
clusterssh/src/cssh.pl
View file

@ -944,16 +944,16 @@ sub check_host($) {
my $host = shift; my $host = shift;
if ( $host =~ m/:/ ) { if ( $host =~ m/:/ ) {
logmsg( 2, "Not resolving IPv6 address '$host'" ); logmsg( 2, "Not resolving IPv6 address '$host'" );
return 1; return $host;
} }
if ( $host =~ m/^(\d{1,3}\.?){4}$/ ) { if ( $host =~ m/^(\d{1,3}\.?){4}$/ ) {
logmsg( 2, "Not resolving IP address '$host'" ); logmsg( 2, "Not resolving IP address '$host'" );
return 1; return $host;
} }
if ( $config{method} eq "ssh" ) { if ( $config{method} eq "ssh" ) {
logmsg( 1, "Attempting name resolution via user ssh config file" ); logmsg( 1, "Attempting name resolution via user ssh config file" );
if ( $ssh_hostnames{$host} ) { if ( $ssh_hostnames{$host} ) {
return 1; return $host;
} }
else { else {
logmsg( 1, logmsg( 1,
@ -973,8 +973,8 @@ sub open_client_windows(@) {
my ( $username, $server, $port ) = split_hostname($_); my ( $username, $server, $port ) = split_hostname($_);
# see if we can find the hostname - if not, drop it # see if we can find the hostname - if not, drop it
my $gethost = check_host($server); my $realname = check_host($server);
if ( !$gethost ) { if ( !$realname ) {
my $text = "WARNING: '$_' unknown"; my $text = "WARNING: '$_' unknown";
if (%ssh_hostnames) { if (%ssh_hostnames) {
@ -998,16 +998,14 @@ sub open_client_windows(@) {
} }
} }
my $count; my $count = q{};
while ( defined( $servers{ $server . q{ } . $count } ) ) { while ( defined( $servers{ $server . q{ } . $count } ) ) {
$count++; $count++;
} }
if ($count) { $server .= q{ } . $count;
$server .= q{ } . $count;
}
$servers{$server}{connect_string} = $_; $servers{$server}{connect_string} = $_;
$servers{$server}{realname} = $server; $servers{$server}{realname} = $realname;
$servers{$server}{username} = $username; $servers{$server}{username} = $username;
$servers{$server}{port} = $port || ''; $servers{$server}{port} = $port || '';
@ -1031,7 +1029,7 @@ sub open_client_windows(@) {
# this is the child # this is the child
# Since this is the child, we can mark any server unresolved without # Since this is the child, we can mark any server unresolved without
# affecting the main program # affecting the main program
$servers{$server}{realname} .= "==" if ( !$gethost ); $servers{$server}{realname} .= "==" if ( !$realname );
my $exec my $exec
= "$config{terminal} $color $config{terminal_args} $config{terminal_allow_send_events} $config{terminal_title_opt} '$config{title}: $servers{$server}{connect_string}' -font $config{terminal_font} -e \"$^X\" \"-e\" '$helper_script' '$servers{$server}{pipenm}' '$servers{$server}{realname}' '$servers{$server}{username}' '$servers{$server}{port}'"; = "$config{terminal} $color $config{terminal_args} $config{terminal_allow_send_events} $config{terminal_title_opt} '$config{title}: $servers{$server}{connect_string}' -font $config{terminal_font} -e \"$^X\" \"-e\" '$helper_script' '$servers{$server}{pipenm}' '$servers{$server}{realname}' '$servers{$server}{username}' '$servers{$server}{port}'";
logmsg( 2, "Terminal exec line:\n$exec\n" ); logmsg( 2, "Terminal exec line:\n$exec\n" );