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

Apply patch from Gerfried Fuchs/Tony Mancill for ports on the command line

Browse source
This commit is contained in:
duncan_ferguson 2009-03-10 09:37:53 +00:00
parent 1f43239cf5
commit aa27e8b481
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clusterssh/ChangeLog
View file

@ -5,6 +5,7 @@
* Allow the configuration files to be symlinks (debian bug 518196)
* Add an 'EXAMPLES' section to the cssh documentation
* List options alphabetically in documentation
* Apply patch from Gerfried Fuchs/Tony Mancill for ports on the command line
2008-11-14 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.24-1

1
clusterssh/THANKS
View file

@ -27,5 +27,6 @@ Nicolas Simonds
Peter Palfrader
David F. Skoll
Bogdan Pintea
Gerfried Fuchs
$Id$

32
clusterssh/src/cssh.pl
View file

@ -85,7 +85,7 @@ use Net::hostent;
my $scriptname = $0;
$scriptname =~ s!.*/!!; # get the script name, minus the path
my $options = 'dDv?hHuqQgGist:T:c:l:o:e:C:'; # Command line options list
my $options = 'dDv?hHuqQgGist:T:c:l:o:e:C:p:'; # Command line options list
my %options;
my %config;
my $debug = 0;
@ -421,7 +421,12 @@ sub evaluate_commands {
$host = $options{e};
$user = $user ? "-l $user" : "";
$port = $port ? "-p $port" : "" unless ( $config{comms} eq "telnet" );
if ( $config{comms} eq "telnet" ) {
$port = $port ? " $port" : "";
}
else {
$port = $port ? "-p $port" : "";
}
print STDERR "Testing terminal - running command:\n";
@ -816,6 +821,7 @@ sub send_resizemove($$$$$) {
sub setup_helper_script() {
logmsg( 2, "Setting up helper script" );
my $defaultport = ( defined $options{p} ) ? $options{p} : "";
$helper_script = <<" HERE";
my \$pipe=shift;
my \$svr=shift;
@ -839,16 +845,12 @@ sub setup_helper_script() {
\$command .= \$user;
}
}
if(\$port) {
if("$config{comms}" eq "telnet") {
\$port = \$port ? "\$port" : "";
\$command .= "\$svr \$port";
} else {
\$port = \$port ? "-p \$port" : "";
\$command .= "\$port \$svr";
}
if($config{comms} eq "telnet") {
\$port = \$port ? "\$port" : "$defaultport";
\$command .= "\$svr \$port";
} else {
\$command .= "\$svr";
\$port = \$port ? "-p \$port" : "-p $defaultport";
\$command .= "\$port \$svr";
}
\$command .= " || sleep 5";
# warn("Running:\$command\\n"); # for debug purposes
@ -2115,6 +2117,10 @@ B<NOTE:> any "generic" change to the method (i.e. specifying the ssh port to use
should be done in the medium's own config file (see L<ssh_config> and
F<$HOME/.ssh/config>).
=item -p <port>
Specify an alternate port for connections.
=item -q|-Q
Enable|Disable automatically quiting after the last client window has closed
@ -2217,9 +2223,9 @@ S<$ cssh -Q user1@server1 admin@server2>
S<$ cssh -c $HOME/cssh.config db_cluster>
=item Use telnet instead of ssh
=item Use telnet on port 2022 instead of ssh
S<$ ctel server1 server2 >
S<$ ctel -p 2022 server1 server2 >
=item Use rsh instead of ssh