summaryrefslogtreecommitdiffstats
path: root/redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-04-28 12:45:19 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-04-28 12:45:19 +0200
commita1ed0f8df1f57a436617c83e0d17a010033fd172 (patch)
tree5b088c57ebd06dcc7cdeba076ef21c68e049cb5d /redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
parent15ce26197ee572979f11cec6d12122923a81e8dc (diff)
downloadtde-packaging-a1ed0f8df1f57a436617c83e0d17a010033fd172.tar.gz
tde-packaging-a1ed0f8df1f57a436617c83e0d17a010033fd172.zip
RHEL/Fedora: updates kdebase 3.5.13
Diffstat (limited to 'redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch')
-rw-r--r--redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch b/redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
new file mode 100644
index 000000000..00d3eea50
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch
@@ -0,0 +1,23 @@
+commit 073dc86aceaa060597d7653747c3c6c14d0ed59d
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1335311121 -0500
+
+ Fix sftp when nonstandard port is specified in ssh config
+
+diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp
+index 2316c8c..04a2b33 100644
+--- a/kioslave/sftp/kio_sftp.cpp
++++ b/kioslave/sftp/kio_sftp.cpp
+@@ -481,11 +481,7 @@ void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, c
+ 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;