From 2e577cecb4aabc42c5301dd76c768e34eb741fb8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 23 Aug 2011 16:25:39 +0200
Subject: [PATCH] auth: Move ssh_auth_list to legacy functions.

---
 include/libssh/legacy.h | 2 ++
 include/libssh/libssh.h | 1 -
 src/auth.c              | 9 ---------
 src/legacy.c            | 7 +++++++
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/libssh/legacy.h b/include/libssh/legacy.h
index 95d74fc0..80b8fac6 100644
--- a/include/libssh/legacy.h
+++ b/include/libssh/legacy.h
@@ -30,6 +30,8 @@
 
 #ifndef LEGACY_H_
 #define LEGACY_H_
+LIBSSH_API int ssh_auth_list(ssh_session session);
+
 LIBSSH_API void buffer_free(ssh_buffer buffer);
 LIBSSH_API void *buffer_get(ssh_buffer buffer);
 LIBSSH_API uint32_t buffer_get_len(ssh_buffer buffer);
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 638cb48a..a5ea9616 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -367,7 +367,6 @@ LIBSSH_API uint32_t ssh_channel_window_size(ssh_channel channel);
 LIBSSH_API int ssh_try_publickey_from_file(ssh_session session, const char *keyfile,
     ssh_string *publickey, int *type);
 
-LIBSSH_API int ssh_auth_list(ssh_session session);
 LIBSSH_API char *ssh_basename (const char *path);
 LIBSSH_API void ssh_clean_pubkey_hash(unsigned char **hash);
 LIBSSH_API int ssh_connect(ssh_session session);
diff --git a/src/auth.c b/src/auth.c
index 7422577d..8f6be485 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -297,15 +297,6 @@ static int wait_auth_status(ssh_session session) {
   return rc;
 }
 
-/**
- * @brief retrieves available authentication methods for this session
- * @deprecated
- * @see ssh_userauth_list
- */
-int ssh_auth_list(ssh_session session) {
-  return ssh_userauth_list(session, NULL);
-}
-
 /**
  * @brief retrieves available authentication methods for this session
  * @param[in] session the SSH session
diff --git a/src/legacy.c b/src/legacy.c
index 25ae53bd..cfe8bc0b 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -35,6 +35,13 @@
 #include <libssh/keys.h>
 #include <libssh/keyfiles.h>
 
+/* AUTH FUNCTIONS */
+int ssh_auth_list(ssh_session session) {
+  return ssh_userauth_list(session, NULL);
+}
+
+/* BUFFER FUNCTIONS */
+
 void buffer_free(ssh_buffer buffer){
   ssh_buffer_free(buffer);
 }