Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-04 17:15:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compilation with libssh4

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-08-17 14:22:53 +00:00
parent 2c4a1bf6e4
commit 34ffb229e4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -142,8 +142,9 @@ sshserver {
# #
INCLUDEPATH += ../../../lib/libssh-0.5.2/include/ INCLUDEPATH += ../../../lib/libssh-0.5.2/include/
LIBS += ../../../lib/libssh-0.5.2/build/src/libssh.a # LIBS += ../../../lib/libssh-0.5.2/build/src/libssh.a
LIBS += ../../../lib/libssh-0.5.2/build/src/threads/libssh_threads.a # LIBS += ../../../lib/libssh-0.5.2/build/src/threads/libssh_threads.a
LIBS *= -lssh
HEADERS += ssh/rssshd.h HEADERS += ssh/rssshd.h
SOURCES += ssh/rssshd.cc SOURCES += ssh/rssshd.cc

4
retroshare-nogui/src/ssh/rssshd.cc
View File

@ -146,7 +146,11 @@ int RsSshd::listenConnect()
return 0; return 0;
} }
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,5,0)
if (ssh_handle_key_exchange(mSession)) if (ssh_handle_key_exchange(mSession))
#else
if (ssh_accept(mSession))
#endif
{ {
printf("ssh_handle_key_exchange: %s\n", ssh_get_error(mSession)); printf("ssh_handle_key_exchange: %s\n", ssh_get_error(mSession));
return 0; return 0;