This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.
commit 4462ca32dc263af78b05758833a3f0d59ff50d79
Author: Mihai Moldovan <io...@ionic.de>
Date: Sat Jan 28 17:52:29 2017 +0100
src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
function with ssh_channel_request_exec ().
Might break on ancient systems, but we don't care.
---
debian/changelog | 3 +++
src/sshmasterconnection.cpp | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6c96f70..e84c4c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -582,6 +582,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
function with ssh_channel_open_session (). Might break on ancient
systems, but we don't care.
+ - src/sshmasterconnection.cpp: replace deprecated channel_request_exec ()
+ function with ssh_channel_request_exec (). Might break on ancient
+ systems, but we don't care.
[ Bernard Cafarelli ]
* New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 8ca51b8..2f6d3cc 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1611,11 +1611,11 @@ void SshMasterConnection::channelLoop()
x2goDebug<<errorMsg<<": "<<err<<endl;
#endif
}
- else if ( channel_request_exec ( channel,
channelConnections[i].command.toLatin1() ) != SSH_OK )
+ else if ( ssh_channel_request_exec ( channel,
channelConnections[i].command.toLatin1() ) != SSH_OK )
{
QString err=ssh_get_error ( my_ssh_session );
- QString errorMsg=tr ( "channel_request_exec failed" );
- emit ioErr ( channelConnections[i].creator, errorMsg,
err );
+ QString errorMsg=tr ( "ssh_channel_request_exec
failed" );
+ emit ioErr ( channelConnections[i].creator, errorMsg +
".", err );
#ifdef DEBUG
x2goDebug<<errorMsg<<": "<<err<<endl;
#endif
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
