diff options
| author | Andreas Schneider <mail@cynapses.org> | 2010-05-11 02:08:29 +0200 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2010-05-11 09:52:06 +0200 |
| commit | 9d7fc9d50b895650f1ec301021b4a202a0fcb3cb (patch) | |
| tree | b3ace2422d959b40669021e1848f2973eba63422 /libssh/client.c | |
| parent | b8bc3a658248692a3d4548fca54201f34713927c (diff) | |
Use the new expand functions.
This implements escape chars for IdentityFile in ssh_config and reads
the system ssh_config.
Diffstat (limited to 'libssh/client.c')
| -rw-r--r-- | libssh/client.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libssh/client.c b/libssh/client.c index 56267784..3999f990 100644 --- a/libssh/client.c +++ b/libssh/client.c @@ -482,6 +482,7 @@ int ssh_connect(ssh_session session) { int ssh1 = 0; int ssh2 = 0; int fd = -1; + int ret; if (session == NULL) { ssh_set_error(session, SSH_FATAL, "Invalid session pointer"); @@ -503,6 +504,14 @@ int ssh_connect(ssh_session session) { leave_function(); return SSH_ERROR; } + + ret = ssh_options_apply(session); + if (ret < 0) { + ssh_set_error(session, SSH_FATAL, "Couldn't apply options"); + leave_function(); + return SSH_ERROR; + } + if (session->fd != -1) { fd = session->fd; #ifndef _WIN32 |
