From 714edcb8d9534d30e9bb7ddb5d7cb3844e3a464c Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Mon, 9 Aug 2010 22:05:33 +0200
Subject: Moved content from deprecated.c to legacy.c

---
 libssh/CMakeLists.txt |  1 -
 libssh/deprecated.c   | 30 ------------------------------
 libssh/legacy.c       |  6 ++++++
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 libssh/deprecated.c

diff --git a/libssh/CMakeLists.txt b/libssh/CMakeLists.txt
index 00fc83c..9baea9f 100644
--- a/libssh/CMakeLists.txt
+++ b/libssh/CMakeLists.txt
@@ -109,7 +109,6 @@ set(libssh_SRCS
   socket.c
   string.c
   wrapper.c
-  deprecated.c
 )
 
 if (WITH_SFTP)
diff --git a/libssh/deprecated.c b/libssh/deprecated.c
deleted file mode 100644
index 11c12aa..0000000
--- a/libssh/deprecated.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * deprecated.c - deprecated functions
- *
- * This file is part of the SSH Library
- *
- * Copyright (c) 2004-2005 by Aris Adamantiadis
- *
- * The SSH Library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version.
- *
- * The SSH Library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the SSH Library; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- */
-
-#include <libssh/server.h>
-
-int ssh_accept(ssh_session session) {
-    (void) session;
-
-    return SSH_OK;
-}
diff --git a/libssh/legacy.c b/libssh/legacy.c
index 5147d04..b2ecc0e 100644
--- a/libssh/legacy.c
+++ b/libssh/legacy.c
@@ -25,6 +25,7 @@
  */
 
 #include <libssh/libssh.h>
+#include <libssh/server.h>
 #include <libssh/buffer.h>
 
 void buffer_free(ssh_buffer buffer){
@@ -231,3 +232,8 @@ char *string_to_char(ssh_string str){
   return ssh_string_to_char(str);
 }
 
+int ssh_accept(ssh_session session) {
+    (void) session;
+
+    return SSH_OK;
+}
-- 
cgit