diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-05 10:01:24 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-05 10:01:24 +0200 |
| commit | 40778d4ba94ab5bfbe71bd3a304d6664c9a02560 (patch) | |
| tree | 5864e2c4bda6c2d1782ef0ba765a40fcd8b8e8c5 /libssh/kex.c | |
| parent | a3a7f17d0f971edce873970863cfe660b21d8f57 (diff) | |
| parent | 60d6954b7560df62634b305fec65dffbc98ff0b8 (diff) | |
| download | libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.gz libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.xz libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.zip | |
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'libssh/kex.c')
| -rw-r--r-- | libssh/kex.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libssh/kex.c b/libssh/kex.c index d8d5b849..8823fbc4 100644 --- a/libssh/kex.c +++ b/libssh/kex.c @@ -38,7 +38,6 @@ #include "libssh/packet.h" #include "libssh/session.h" #include "libssh/wrapper.h" -#include "libssh/options.h" #include "libssh/keys.h" #include "libssh/dh.h" @@ -339,7 +338,6 @@ void ssh_list_kex(ssh_session session, KEX *kex) { int set_kex(ssh_session session){ KEX *server = &session->server_kex; KEX *client=&session->client_kex; - ssh_options options=session->options; int i; const char *wanted; enter_function(); @@ -352,7 +350,7 @@ int set_kex(ssh_session session){ } memset(client->methods,0,10*sizeof(char **)); for (i=0;i<10;i++){ - if(!(wanted=options->wanted_methods[i])) + if(!(wanted=session->wanted_methods[i])) wanted=default_methods[i]; client->methods[i]=ssh_find_matching(server->methods[i],wanted); if(!client->methods[i] && i < SSH_LANG_C_S){ |