aboutsummaryrefslogtreecommitdiff
path: root/libssh/client.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-06-15 15:31:23 +0000
committerAndreas Schneider <mail@cynapses.org>2009-07-29 17:50:04 +0200
commit7fa1804cf1fb1c57c53a864e055deff0bceca1bb (patch)
treee27da9a7f92167647be02284a7bff87d9fe804b5 /libssh/client.c
parentad86a378d9ef7eff8131a0495ca36ceb6a6eace0 (diff)
downloadlibssh-7fa1804cf1fb1c57c53a864e055deff0bceca1bb.tar.gz
libssh-7fa1804cf1fb1c57c53a864e055deff0bceca1bb.tar.xz
libssh-7fa1804cf1fb1c57c53a864e055deff0bceca1bb.zip
ssh_init()
fixes in client.c and server.c for this git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@778 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/client.c')
-rw-r--r--libssh/client.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libssh/client.c b/libssh/client.c
index 2ef5568e..e6521d0c 100644
--- a/libssh/client.c
+++ b/libssh/client.c
@@ -491,15 +491,10 @@ int ssh_connect(SSH_SESSION *session) {
session->alive = 0;
session->client = 1;
- if (ssh_crypto_init() < 0) {
+ if (ssh_init() < 0) {
leave_function();
return SSH_ERROR;
}
- if (ssh_socket_init() < 0) {
- leave_function();
- return SSH_ERROR;
- }
-
if (options->fd == -1 && options->host == NULL) {
ssh_set_error(session, SSH_FATAL, "Hostname required");
leave_function();