summaryrefslogtreecommitdiffstats
path: root/include/libssh/bind.h
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2011-07-19 22:16:28 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-09-17 22:01:43 +0200
commit0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf (patch)
treef15352f0ddd948e9e9ba1ed1c5103d3333220bef /include/libssh/bind.h
parent3799670d01f4faa68b6ab8055250bc042d707b29 (diff)
downloadlibssh-0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf.tar.gz
libssh-0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf.tar.xz
libssh-0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf.zip
Fixes the ssh_log issue on ssh_bind handles.
(cherry picked from commit da954c2c5ee85bcbe2f5ad9f507a6306b0f5f8b9) Conflicts: src/keyfiles.c
Diffstat (limited to 'include/libssh/bind.h')
-rw-r--r--include/libssh/bind.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/libssh/bind.h b/include/libssh/bind.h
index 705d2759..ef3a0e82 100644
--- a/include/libssh/bind.h
+++ b/include/libssh/bind.h
@@ -23,11 +23,10 @@
#define BIND_H_
#include "libssh/priv.h"
+#include "libssh/session.h"
struct ssh_bind_struct {
- struct error_struct error;
-
- ssh_callbacks callbacks; /* Callbacks to user functions */
+ struct ssh_common_struct common; /* stuff common to ssh_bind and ssh_session */
struct ssh_bind_callbacks_struct *bind_callbacks;
void *bind_callbacks_userdata;
@@ -40,8 +39,6 @@ struct ssh_bind_struct {
char *bindaddr;
socket_t bindfd;
unsigned int bindport;
- unsigned int log_verbosity;
-
int blocking;
int toaccept;
};