trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: May 2012

Re: [trinity-devel] sftp-kio - still fails in R14 - Any progress? (log captured - may help?)

From: "David C. Rankin" <drankinatty@...>
Date: Wed, 02 May 2012 11:08:26 -0500
On 05/02/2012 10:35 AM, Slávek Banko wrote:
> Dne út 24. dubna 2012 François Andriot napsal(a):
>> But I did not find a place to download your patches. (I haven't
>> searched a lot ...) If you share them, I will happily use them too.
>>  
>> Francois
> 
> Please could you compare if you have included patches that I am not 
> incorporated? If will be managed to set up a GIT branch for 3.5.13 
> updates, there would be good to incorporate also patches from you.
> 
> My patches are now available for download here:
> http://www.axis.cz/linux/trinity-3.5.13-udpate-patches-1.tgz
> 
> Slavek

Here is the patch itself (with comment included):

--- tdebase/kioslave/sftp/kio_sftp.cpp
+++ tdebase/kioslave/sftp/kio_sftp.cpp  2012-05-02 11:05:54.872250800 -0500
@@ -478,15 +478,12 @@

     mHost = h;

+    // if port is NOT provided by user in URL, do NOT pass port to ssh
+    // 04-25-2012, fixed sftp:// failure (TDE bug 897)
     if( port > 0 )
         mPort = port;
-    else {
-        struct servent *pse;
-        if( (pse = getservbyname("ssh", "tcp") ) == NULL )
-            mPort = 22;
         else
-            mPort = ntohs(pse->s_port);
-    }
+       mPort = -1;

     mUsername = user;
     mPassword = pass;


-- 
David C. Rankin, J.D.,P.E.