[X2Go-Commits] [x2goclient] 03/18: src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().

git-admin at x2go.org git-admin at x2go.org
Fri Feb 10 05:35:19 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 de301a6c97b465e9decbd82b8481298cba255a48
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jan 28 17:15:38 2017 +0100

    src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free ().
    
    Will break on ancient systems, but we don't care.
---
 debian/changelog            |    2 ++
 src/sshmasterconnection.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a7d6350..e7daad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -575,6 +575,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
       ssh_get_hexa (). This will break on very old systems with a hopelessly
       outdated libssh version, but we do not care about these systems in the
       first place.
+    - src/sshmasterconnection.cpp: replace string_free () with its successor
+      ssh_string_free (). Will 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 c786717..57c33fa 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1192,7 +1192,7 @@ bool SshMasterConnection::userAuthWithKey()
 
     int rc=ssh_userauth_pubkey(my_ssh_session, NULL, pubkeyStr, prkey);
     privatekey_free(prkey);
-    string_free(pubkeyStr);
+    ssh_string_free(pubkeyStr);
 
 #ifdef DEBUG
     x2goDebug<<"Authenticating with key: "<<rc<<endl;

--
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