From ffed8b03bb6e170abbd9564547ba439302840618 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 23 Sep 2009 21:40:58 +0200
Subject: remove the broken setters for options,cb init macro

---
 include/libssh/callback.h | 6 +++++-
 include/libssh/libssh.h   | 7 -------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/libssh/callback.h b/include/libssh/callback.h
index 3e1a1fa..fd60bc1 100644
--- a/include/libssh/callback.h
+++ b/include/libssh/callback.h
@@ -27,7 +27,7 @@
 #define _SSH_CALLBACK_H
 
 #include "libssh.h"
-
+#include <string.h>
 /**
  * @brief SSH authentication callback.
  *
@@ -55,6 +55,10 @@ struct ssh_callbacks_struct {
 };
 
 typedef struct ssh_callbacks_struct * ssh_callbacks;
+#define ssh_callbacks_init(p) do {\
+	memset(p,'\0',sizeof(*p)); \
+	p->size=sizeof(*p); \
+} while(0);
 
 LIBSSH_API int ssh_options_set_auth_callback(SSH_OPTIONS *opt, ssh_auth_callback cb,
     void *userdata);
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 10103e5..cfb2583 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -252,13 +252,6 @@ enum ssh_options_e {
   SSH_OPTIONS_SSH2,
   SSH_OPTIONS_LOG_VERBOSITY,
 
-  SSH_OPTIONS_AUTH_CALLBACK,
-  SSH_OPTIONS_AUTH_USERDATA,
-  SSH_OPTIONS_LOG_CALLBACK,
-  SSH_OPTIONS_LOG_USERDATA,
-  SSH_OPTIONS_STATUS_CALLBACK,
-  SSH_OPTIONS_STATUS_ARG,
-
   SSH_OPTIONS_CIPHERS_C_S,
   SSH_OPTIONS_CIPHERS_S_C,
   SSH_OPTIONS_COMPRESSION_C_S,
-- 
cgit