shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

options: Make sure that we have always have default options set.

Browse Source
This commit is contained in:
Andreas Schneider
2010-05-21 10:21:03 +02:00
parent 13af149ef9
commit 5b2e39cd79
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libssh/auth.c
View File

@@ -225,7 +225,7 @@ int ssh_userauth_none(ssh_session session, const char *username) {
if (username == NULL) { if (username == NULL) {
if (session->username == NULL) { if (session->username == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { if (ssh_options_apply(session) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -331,7 +331,7 @@ int ssh_userauth_offer_pubkey(ssh_session session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->username == NULL) { if (session->username == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { if (ssh_options_apply(session) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -443,7 +443,7 @@ int ssh_userauth_pubkey(ssh_session session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->username == NULL) { if (session->username == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { if (ssh_options_apply(session) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -561,7 +561,7 @@ int ssh_userauth_agent_pubkey(ssh_session session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->username == NULL) { if (session->username == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { if (ssh_options_apply(session) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -688,7 +688,7 @@ int ssh_userauth_password(ssh_session session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->username == NULL) { if (session->username == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { if (ssh_options_apply(session) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -777,7 +777,6 @@ error:
* *
* @see ssh_userauth_kbdint() * @see ssh_userauth_kbdint()
* @see ssh_userauth_password() * @see ssh_userauth_password()
* @see ssh_options_set()
*/ */
int ssh_userauth_autopubkey(ssh_session session, const char *passphrase) { int ssh_userauth_autopubkey(ssh_session session, const char *passphrase) {
struct ssh_iterator *it; struct ssh_iterator *it;
@@ -1336,7 +1335,7 @@ int ssh_userauth_kbdint(ssh_session session, const char *user,
/* first time we call. we must ask for a challenge */ /* first time we call. we must ask for a challenge */
if (user == NULL) { if (user == NULL) {
if ((user = session->username) == NULL) { if ((user = session->username) == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_USER, NULL) < 0) { if (ssh_options_apply(session) < 0) {
leave_function(); leave_function();
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} else { } else {

7
libssh/keyfiles.c
View File

@@ -1077,7 +1077,7 @@ int ssh_try_publickey_from_file(ssh_session session, const char *keyfile,
} }
if (session->sshdir == NULL) { if (session->sshdir == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_SSH_DIR, NULL) < 0) { if (ssh_options_apply(session) < 0) {
return -1; return -1;
} }
} }
@@ -1145,7 +1145,7 @@ ssh_string try_publickey_from_file(ssh_session session, struct ssh_keys_struct k
} }
if (session->sshdir == NULL) { if (session->sshdir == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_SSH_DIR, NULL) < 0) { if (ssh_options_apply(session) < 0) {
return NULL; return NULL;
} }
} }
@@ -1550,7 +1550,6 @@ static int match_hashed_host(ssh_session session, const char *host,
* if host key is accepted\n * if host key is accepted\n
* SSH_SERVER_ERROR: Some error happened * SSH_SERVER_ERROR: Some error happened
* *
* \see ssh_options_set()
* \see ssh_get_pubkey_hash() * \see ssh_get_pubkey_hash()
* *
* \bug There is no current way to remove or modify an entry into the known * \bug There is no current way to remove or modify an entry into the known
@@ -1568,7 +1567,7 @@ int ssh_is_server_known(ssh_session session) {
enter_function(); enter_function();
if (session->knownhosts == NULL) { if (session->knownhosts == NULL) {
if (ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, NULL) < 0) { if (ssh_options_apply(session) < 0) {
ssh_set_error(session, SSH_REQUEST_DENIED, ssh_set_error(session, SSH_REQUEST_DENIED,
"Can't find a known_hosts file"); "Can't find a known_hosts file");
leave_function(); leave_function();