Get rid of the options structure.

1 files changed, 15 insertions, 5 deletions

diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index a9da5a5c..8dbf9a3f 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -95,11 +95,21 @@ struct ssh_message_struct;
 /* server data */
 
 struct ssh_bind_struct {
-    struct error_struct error;
-    socket_t bindfd;
-    ssh_options options;
-    int blocking;
-    int toaccept;
+  struct error_struct error;
+
+  ssh_callbacks callbacks; /* Callbacks to user functions */
+
+  /* options */
+  char *wanted_methods[10];
+  char *banner;
+  char *dsakey;
+  char *rsakey;
+  char *bindaddr;
+  socket_t bindfd;
+  unsigned int bindport;
+
+  int blocking;
+  int toaccept;
 };