[X2Go-Commits] [x2goclient] 06/18: src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session ().
git-admin at x2go.org
git-admin at x2go.org
Wed Feb 8 20:50:25 CET 2017
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 e753fe2ce5c21282d9a9ba5b65450f80011a992b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Jan 28 17:50:05 2017 +0100
src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session ().
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 45a6816..907966f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -579,6 +579,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
function with ssh_channel_open_forward (). Might break on ancient
systems, but we don't care.
+ - src/sshmasterconnection.cpp: replace deprecated channel_open_session ()
+ function with ssh_channel_open_session (). 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 ba955cd..d671d35 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1602,11 +1602,11 @@ void SshMasterConnection::channelLoop()
#ifdef DEBUG
x2goDebug<<"Executing remote: "<<channelConnections.at ( i ).command<<endl;
#endif
- if ( channel_open_session ( channel ) !=SSH_OK )
+ if ( ssh_channel_open_session ( channel ) !=SSH_OK )
{
QString err=ssh_get_error ( my_ssh_session );
- QString errorMsg=tr ( "channel_open_session failed." );
- emit ioErr ( channelConnections[i].creator, errorMsg, err );
+ QString errorMsg=tr ( "ssh_channel_open_session 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
More information about the x2go-commits
mailing list