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/auth1.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/auth1.c')
| -rw-r--r-- | libssh/auth1.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libssh/auth1.c b/libssh/auth1.c index 36db5b1d..c3d5b3f4 100644 --- a/libssh/auth1.c +++ b/libssh/auth1.c @@ -21,6 +21,8 @@ * MA 02111-1307, USA. */ +#include "config.h" + #include <string.h> #include <stdlib.h> @@ -30,7 +32,6 @@ #include "libssh/packet.h" #include "libssh/session.h" #include "libssh/string.h" -#include "libssh/options.h" #ifdef WITH_SSH1 static int wait_auth1_status(ssh_session session) { @@ -64,11 +65,11 @@ static int send_username(ssh_session session, const char *username) { } if (!username) { - if(!(username = session->options->username)) { - if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) { + if(!(username = session->username)) { + if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { return session->auth_service_asked = SSH_AUTH_ERROR; } else { - username = session->options->username; + username = session->username; } } } |