[Mew-dist 10820] Re: im-131

[Kazu Yamamoto ( 山本和彦 )]

SSH ですが、さらの im-131 に以下のパッチを当てて試して下さい。OK なら、
132 にマージします。

--かず
-------------- next part --------------
? SetVersion
Index: IM/Ssh.pm
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/im/IM/Ssh.pm,v
retrieving revision 1.3
diff -c -r1.3 Ssh.pm
*** Ssh.pm	1999/10/07 07:38:26	1.3
--- Ssh.pm	1999/10/07 10:14:39
***************
*** 1,7 ****
  # -*-Perl-*-
  ################################################################
  ###
! ###			  TcpTransaction.pm
  ###
  ### Author:  Masatoshi Tsuchiya <tsuchiya at example.com>
  ### Created: Oct 05, 1999
--- 1,7 ----
  # -*-Perl-*-
  ################################################################
  ###
! ###			  Ssh.pm
  ###
  ### Author:  Masatoshi Tsuchiya <tsuchiya at example.com>
  ### Created: Oct 05, 1999
***************
*** 16,22 ****
  use IM::Config qw( connect_timeout command_timeout );
  use IM::Util;
  use strict;
! use vars qw( @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $SSH $FH @PID $VERSION );
  @ISA       = qw( Exporter );
  @EXPORT    = qw( ssh_proxy );
  @EXPORT_OK = qw( $SSH );
--- 16,22 ----
  use IM::Config qw( connect_timeout command_timeout );
  use IM::Util;
  use strict;
! use vars qw( @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $SSH $FH @PID );
  @ISA       = qw( Exporter );
  @EXPORT    = qw( ssh_proxy );
  @EXPORT_OK = qw( $SSH );
***************
*** 27,35 ****
  # Global Variables
  $FH      = "SSH00000";
  @PID     = ();
- $VERSION = sprintf("%d.%02d", q$Revision: 1.3 $ =~ /(\d+)\.(\d+)/);
  
- 
  sub ssh_proxy ($$$$) {
      my( $server, $remote, $local, $host ) = @_;
  
--- 27,33 ----
***************
*** 37,46 ****
  	im_err( "Missing relay host.\n" );
  	return 0;
      }
-     unless( -x $SSH ){
- 	im_err( "$SSH is not executable.\n" );
- 	return 0;
-     };
      im_notice( "openning SSH-tunnel to $server/$remote\%$local via $host\n" )
  	if &verbose;
  
--- 35,40 ----
Index: IM/TcpTransaction.pm
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/im/IM/TcpTransaction.pm,v
retrieving revision 1.42
diff -c -r1.42 TcpTransaction.pm
*** TcpTransaction.pm	1999/10/07 07:38:26	1.42
--- TcpTransaction.pm	1999/10/07 10:14:39
***************
*** 118,126 ****
  		im_warn( "Don't use port-forwarding to `localhost'.\n" );
  		$Cur_server = "$s/$remoteport";
  	    } else {
! 		if ( $localport = &ssh_proxy($s,$remoteport,$localport,$main::SSH_server) ) {
  		    $s = 'localhost';
! 		    $Cur_server = "$Cur_server%$localport";
  		} else { # Connection failed.
  		    im_warn( "Can't login to $main::SSH_server\n" );
  		    if ($proto eq 'smtp') {
--- 118,126 ----
  		im_warn( "Don't use port-forwarding to `localhost'.\n" );
  		$Cur_server = "$s/$remoteport";
  	    } else {
! 		if ( $remoteport = &ssh_proxy($s,$remoteport,$localport,$main::SSH_server) ) {
  		    $s = 'localhost';
! 		    $Cur_server = "$Cur_server%$remoteport";
  		} else { # Connection failed.
  		    im_warn( "Can't login to $main::SSH_server\n" );
  		    if ($proto eq 'smtp') {