diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index c4822441a..0833bab5c 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -142,8 +142,9 @@ sshserver { # 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/threads/libssh_threads.a +# LIBS += ../../../lib/libssh-0.5.2/build/src/libssh.a +# LIBS += ../../../lib/libssh-0.5.2/build/src/threads/libssh_threads.a +LIBS *= -lssh HEADERS += ssh/rssshd.h SOURCES += ssh/rssshd.cc diff --git a/retroshare-nogui/src/ssh/rssshd.cc b/retroshare-nogui/src/ssh/rssshd.cc index a5d1cc6f0..b75c32e89 100644 --- a/retroshare-nogui/src/ssh/rssshd.cc +++ b/retroshare-nogui/src/ssh/rssshd.cc @@ -146,7 +146,11 @@ int RsSshd::listenConnect() return 0; } +#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,5,0) if (ssh_handle_key_exchange(mSession)) +#else + if (ssh_accept(mSession)) +#endif { printf("ssh_handle_key_exchange: %s\n", ssh_get_error(mSession)); return 0;