From b3067e362c68210c65bed6d4bd17214a0db0da91 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Thu, 19 Aug 2010 19:53:16 +0200 Subject: [PATCH] Obsoletes ssh_auth_list, comment ssh_userauth_list Conflicts: libssh/auth.c --- libssh/auth.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/libssh/auth.c b/libssh/auth.c index b4755f47..b4705204 100644 --- a/libssh/auth.c +++ b/libssh/auth.c @@ -170,24 +170,33 @@ static int wait_auth_status(ssh_session session, int kbdint) { return rc; } +/** + * @brief retrieves available authentication methods for this session + * @obsolete + * @see ssh_userauth_list + */ int ssh_auth_list(ssh_session session) { - if (session == NULL) { - return -1; - } - - return session->auth_methods; + return ssh_userauth_list(session, NULL); } +/** + * @brief retrieves available authentication methods for this session + * @param[in] session the SSH session + * @param[in] username set to NULL + * @returns A bitfield of values SSH_AUTH_METHOD_NONE, SSH_AUTH_METHOD_PASSWORD, + SSH_AUTH_METHOD_PUBLICKEY, SSH_AUTH_METHOD_HOSTBASED, + SSH_AUTH_METHOD_INTERACTIVE. + @warning Other reserved flags may appear in future versions. + */ int ssh_userauth_list(ssh_session session, const char *username) { - if (session == NULL || username == NULL) { + if (session == NULL) { return SSH_AUTH_ERROR; } if (session->auth_methods == 0) { ssh_userauth_none(session, username); } - - return ssh_auth_list(session); + return session->auth_methods; } /* use the "none" authentication question */