lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-02 01:17:52 +03:00
Code Activity

Obsoletes ssh_auth_list, comment ssh_userauth_list

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-08-19 19:51:18 +02:00
parent 32bf28e7ef
commit 1e75841036
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libssh/auth.c
View File

@@ -248,28 +248,38 @@ static int wait_auth_status(ssh_session session) {
return rc; return rc;
} }
/**
* @brief retrieves available authentication methods for this session
* @obsolete
* @see ssh_userauth_list
*/
int ssh_auth_list(ssh_session session) { int ssh_auth_list(ssh_session session) {
if (session == NULL) { return ssh_userauth_list(session, NULL);
return -1;
} }
/**
* @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) {
return SSH_AUTH_ERROR;
}
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if(session->version==1){ if(session->version==1){
return SSH_AUTH_METHOD_PASSWORD; return SSH_AUTH_METHOD_PASSWORD;
} }
#endif #endif
return session->auth_methods;
}
int ssh_userauth_list(ssh_session session, const char *username) {
if (session == NULL || username == NULL) {
return SSH_AUTH_ERROR;
}
if (session->auth_methods == 0) { if (session->auth_methods == 0) {
ssh_userauth_none(session, username); ssh_userauth_none(session, username);
} }
return session->auth_methods;
return ssh_auth_list(session);
} }
/* use the "none" authentication question */ /* use the "none" authentication question */