lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-03 13:31:11 +03:00
Code Activity

Use new ssh options interface in auth functions.

Browse Source
This commit is contained in:
Andreas Schneider
2009-09-22 13:22:21 +02:00
parent 2003a81b44
commit 8b21b51a78
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libssh/auth.c
View File

@@ -218,7 +218,7 @@ int ssh_userauth_none(SSH_SESSION *session, const char *username) {
if (username == NULL) { if (username == NULL) {
if (session->options->username == NULL) { if (session->options->username == NULL) {
if (ssh_options_default_username(session->options) < 0) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -324,7 +324,7 @@ int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->options->username == NULL) { if (session->options->username == NULL) {
if (ssh_options_default_username(session->options) < 0) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -436,7 +436,7 @@ int ssh_userauth_pubkey(SSH_SESSION *session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->options->username == NULL) { if (session->options->username == NULL) {
if (ssh_options_default_username(session->options) < 0) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -554,7 +554,7 @@ int ssh_userauth_agent_pubkey(SSH_SESSION *session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->options->username == NULL) { if (session->options->username == NULL) {
if (ssh_options_default_username(session->options) < 0) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -681,7 +681,7 @@ int ssh_userauth_password(SSH_SESSION *session, const char *username,
if (username == NULL) { if (username == NULL) {
if (session->options->username == NULL) { if (session->options->username == NULL) {
if (ssh_options_default_username(session->options) < 0) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
leave_function(); leave_function();
return rc; return rc;
} }
@@ -806,7 +806,7 @@ static struct ssh_keys_struct keytab[] = {
* *
* @see ssh_userauth_kbdint() * @see ssh_userauth_kbdint()
* @see ssh_userauth_password() * @see ssh_userauth_password()
* @see ssh_options_set_identity() * @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_public_key_struct *publickey; struct ssh_public_key_struct *publickey;
@@ -1354,7 +1354,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->options->username) == NULL) { if ((user = session->options->username) == NULL) {
if (ssh_options_default_username(session->options) < 0) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
leave_function(); leave_function();
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} else { } else {

2
libssh/auth1.c
View File

@@ -60,7 +60,7 @@ static int send_username(SSH_SESSION *session, const char *username) {
if (!username) { if (!username) {
if(!(username = session->options->username)) { if(!(username = session->options->username)) {
if(ssh_options_default_username(session->options)) { if (ssh_options_set(session->options, SSH_OPTIONS_USER, NULL) < 0) {
return session->auth_service_asked = SSH_AUTH_ERROR; return session->auth_service_asked = SSH_AUTH_ERROR;
} else { } else {
username = session->options->username; username = session->options->username;