From 8b21b51a78e07a9fb0c2ea90292c5b166e44269c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Tue, 22 Sep 2009 13:22:21 +0200
Subject: Use new ssh options interface in auth functions.

---
 libssh/auth.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libssh/auth.c')

diff --git a/libssh/auth.c b/libssh/auth.c
index 1aa2b8c9..b5276f17 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -218,7 +218,7 @@ int ssh_userauth_none(SSH_SESSION *session, const char *username) {
 
   if (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();
         return rc;
       }
@@ -324,7 +324,7 @@ int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username,
 
   if (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();
         return rc;
       }
@@ -436,7 +436,7 @@ int ssh_userauth_pubkey(SSH_SESSION *session, const char *username,
 
   if (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();
         return rc;
       }
@@ -554,7 +554,7 @@ int ssh_userauth_agent_pubkey(SSH_SESSION *session, const char *username,
 
   if (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();
         return rc;
       }
@@ -681,7 +681,7 @@ int ssh_userauth_password(SSH_SESSION *session, const char *username,
 
   if (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();
         return rc;
       }
@@ -806,7 +806,7 @@ static struct ssh_keys_struct keytab[] = {
  *
  * @see ssh_userauth_kbdint()
  * @see ssh_userauth_password()
- * @see ssh_options_set_identity()
+ * @see ssh_options_set()
  */
 int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
   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 */
     if (user == 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();
           return SSH_AUTH_ERROR;
         } else {
-- 
cgit