diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-07-19 22:16:28 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-17 22:01:43 +0200 |
| commit | 0dc57fdcf17fd9e5c000e2a07380ec6878d3afcf (patch) | |
| tree | f15352f0ddd948e9e9ba1ed1c5103d3333220bef /src/messages.c | |
| parent | 3799670d01f4faa68b6ab8055250bc042d707b29 (diff) | |
| download | libssh-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 'src/messages.c')
| -rw-r--r-- | src/messages.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/messages.c b/src/messages.c index dfe04a14..ff8c1c17 100644 --- a/src/messages.c +++ b/src/messages.c @@ -945,9 +945,9 @@ SSH_PACKET_CALLBACK(ssh_packet_global_request){ ssh_log(session, SSH_LOG_PROTOCOL, "Received SSH_MSG_GLOBAL_REQUEST %s %d %s:%d", request, want_reply, bind_addr, bind_port); - if(ssh_callbacks_exists(session->callbacks, global_request_function)) { + if(ssh_callbacks_exists(session->common.callbacks, global_request_function)) { ssh_log(session, SSH_LOG_PROTOCOL, "Calling callback for SSH_MSG_GLOBAL_REQUEST %s %d %s:%d", request, want_reply, bind_addr, bind_port); - session->callbacks->global_request_function(session, msg, session->callbacks->userdata); + session->common.callbacks->global_request_function(session, msg, session->common.callbacks->userdata); } else { ssh_message_reply_default(msg); } @@ -967,8 +967,8 @@ SSH_PACKET_CALLBACK(ssh_packet_global_request){ ssh_log(session, SSH_LOG_PROTOCOL, "Received SSH_MSG_GLOBAL_REQUEST %s %d %s:%d", request, want_reply, bind_addr, bind_port); - if(ssh_callbacks_exists(session->callbacks, global_request_function)) { - session->callbacks->global_request_function(session, msg, session->callbacks->userdata); + if(ssh_callbacks_exists(session->common.callbacks, global_request_function)) { + session->common.callbacks->global_request_function(session, msg, session->common.callbacks->userdata); } else { ssh_message_reply_default(msg); } |