diff options
| author | Andreas Schneider <mail@cynapses.org> | 2010-05-21 10:21:03 +0200 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2010-05-21 10:23:19 +0200 |
| commit | 55ef7bc0123ca896fedd968605ed79f56e3175c7 (patch) | |
| tree | 3ff8cf1d4d33bdfab86024cd111c49fc64ab3042 /libssh/auth.c | |
| parent | d3f1d094f72ced9ab864c78d9f780be36036c6dc (diff) | |
| download | libssh-55ef7bc0123ca896fedd968605ed79f56e3175c7.tar.gz libssh-55ef7bc0123ca896fedd968605ed79f56e3175c7.tar.xz libssh-55ef7bc0123ca896fedd968605ed79f56e3175c7.zip | |
options: Make sure that we have always have default options set.
Diffstat (limited to 'libssh/auth.c')
| -rw-r--r-- | libssh/auth.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libssh/auth.c b/libssh/auth.c index 937c3ff..0e88fbd 100644 --- a/libssh/auth.c +++ b/libssh/auth.c @@ -310,7 +310,7 @@ int ssh_userauth_none(ssh_session session, const char *username) { } if (username == NULL) { if (session->username == NULL) { - if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { + if (ssh_options_apply(session) < 0) { leave_function(); return rc; } @@ -417,7 +417,7 @@ int ssh_userauth_offer_pubkey(ssh_session session, const char *username, if (username == NULL) { if (session->username == NULL) { - if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { + if (ssh_options_apply(session) < 0) { leave_function(); return rc; } @@ -532,7 +532,7 @@ int ssh_userauth_pubkey(ssh_session session, const char *username, if (username == NULL) { if (session->username == NULL) { - if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { + if (ssh_options_apply(session) < 0) { leave_function(); return rc; } @@ -729,7 +729,7 @@ int ssh_userauth_agent_pubkey(ssh_session session, const char *username, if (username == NULL) { if (session->username == NULL) { - if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { + if (ssh_options_apply(session) < 0) { leave_function(); return rc; } @@ -857,7 +857,7 @@ int ssh_userauth_password(ssh_session session, const char *username, if (username == NULL) { if (session->username == NULL) { - if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { + if (ssh_options_apply(session) < 0) { leave_function(); return rc; } @@ -946,7 +946,6 @@ error: * * @see ssh_userauth_kbdint() * @see ssh_userauth_password() - * @see ssh_options_set() */ int ssh_userauth_autopubkey(ssh_session session, const char *passphrase) { struct ssh_iterator *it; @@ -1523,7 +1522,7 @@ int ssh_userauth_kbdint(ssh_session session, const char *user, /* first time we call. we must ask for a challenge */ if (user == NULL) { if ((user = session->username) == NULL) { - if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { + if (ssh_options_apply(session) < 0) { leave_function(); return SSH_AUTH_ERROR; } else { |