From 519291558d5c702775d60253e6b9d9ca9249b59a Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 17 Sep 2011 11:56:35 +0200
Subject: [PATCH] priv: Move options and config prototypes to own header.

---
 include/libssh/options.h | 29 +++++++++++++++++++++++++++++
 include/libssh/priv.h    |  7 -------
 src/client.c             |  1 +
 src/config.c             |  1 +
 src/known_hosts.c        |  1 +
 src/legacy.c             |  1 +
 src/options.c            |  1 +
 src/server.c             |  1 +
 8 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 include/libssh/options.h

diff --git a/include/libssh/options.h b/include/libssh/options.h
new file mode 100644
index 00000000..df28a6f8
--- /dev/null
+++ b/include/libssh/options.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the SSH Library
+ *
+ * Copyright (c) 2011      Andreas Schneider <asn@cryptomilk.org>
+ *
+ * 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.
+ */
+
+#ifndef _OPTIONS_H
+#define _OPTIONS_H
+
+int ssh_config_parse_file(ssh_session session, const char *filename);
+int ssh_options_set_algo(ssh_session session, int algo, const char *list);
+int ssh_options_apply(ssh_session session);
+
+#endif /* _OPTIONS_H */
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 5c34b17e..9802e387 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -152,9 +152,6 @@ SSH_PACKET_CALLBACK(ssh_packet_dh_reply);
 SSH_PACKET_CALLBACK(ssh_packet_newkeys);
 SSH_PACKET_CALLBACK(ssh_packet_service_accept);
 
-/* config.c */
-int ssh_config_parse_file(ssh_session session, const char *filename);
-
 /* errors.c */
 #define ssh_set_error(error, code, ...) \
     _ssh_set_error(error, code, __FUNCTION__, __VA_ARGS__)
@@ -248,10 +245,6 @@ int message_handle(ssh_session session, void *user, uint8_t type, ssh_buffer pac
 #define leave_function() (void)session
 #endif
 
-/* options.c  */
-
-int ssh_options_set_algo(ssh_session session, int algo, const char *list);
-int ssh_options_apply(ssh_session session);
 
 /* server.c */
 SSH_PACKET_CALLBACK(ssh_packet_kexdh_init);
diff --git a/src/client.c b/src/client.c
index 60fb0bb2..ef996ffa 100644
--- a/src/client.c
+++ b/src/client.c
@@ -33,6 +33,7 @@
 #include "libssh/ssh2.h"
 #include "libssh/buffer.h"
 #include "libssh/packet.h"
+#include "libssh/options.h"
 #include "libssh/socket.h"
 #include "libssh/session.h"
 #include "libssh/dh.h"
diff --git a/src/config.c b/src/config.c
index b8b6a0ed..67111c79 100644
--- a/src/config.c
+++ b/src/config.c
@@ -28,6 +28,7 @@
 #include "libssh/priv.h"
 #include "libssh/session.h"
 #include "libssh/misc.h"
+#include "libssh/options.h"
 
 enum ssh_config_opcode_e {
   SOC_UNSUPPORTED = -1,
diff --git a/src/known_hosts.c b/src/known_hosts.c
index 3e5b2793..5cfec520 100644
--- a/src/known_hosts.c
+++ b/src/known_hosts.c
@@ -33,6 +33,7 @@
 #include "libssh/buffer.h"
 #include "libssh/misc.h"
 #include "libssh/pki.h"
+#include "libssh/options.h"
 
 /*todo: remove this include */
 #include "libssh/string.h"
diff --git a/src/legacy.c b/src/legacy.c
index f8a159f5..75926bd4 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -37,6 +37,7 @@
 #include "libssh/pki_priv.h"
 #include <libssh/misc.h>
 #include <libssh/keys.h>
+#include "libssh/options.h"
 
 /* AUTH FUNCTIONS */
 int ssh_auth_list(ssh_session session) {
diff --git a/src/options.c b/src/options.c
index d55a6470..105ffac8 100644
--- a/src/options.c
+++ b/src/options.c
@@ -35,6 +35,7 @@
 #include "libssh/priv.h"
 #include "libssh/session.h"
 #include "libssh/misc.h"
+#include "libssh/options.h"
 #ifdef WITH_SERVER
 #include "libssh/server.h"
 #include "libssh/bind.h"
diff --git a/src/server.c b/src/server.c
index 90bc8ebb..8777e170 100644
--- a/src/server.c
+++ b/src/server.c
@@ -56,6 +56,7 @@
 #include "libssh/pki.h"
 #include "libssh/dh.h"
 #include "libssh/messages.h"
+#include "libssh/options.h"
 
 #define set_status(session, status) do {\
         if (session->common.callbacks && session->common.callbacks->connect_status_function) \