3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-29 00:32:34 +08:00
Code Issues Projects Releases Wiki Activity

fixes for gssapi build issue

Browse Source
This commit is contained in:
Chris Laws 2014-04-25 13:48:39 +09:30
parent 09647fa916
commit 7abf2564f8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gssapi_client.cpp
View File

@ -18,6 +18,9 @@
*/ */
#include "platform.hpp" #include "platform.hpp"
#ifdef HAVE_LIBGSSAPI_KRB5
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp" #include "windows.hpp"
#endif #endif
@ -71,7 +74,7 @@ int zmq::gssapi_client_t::next_handshake_command (msg_t *msg_)
{ {
if (state == send_ready) { if (state == send_ready) {
int rc = produce_ready(msg_); int rc = produce_ready(msg_);
if (rc == 0) if (rc == 0)
state = connected; state = connected;
return rc; return rc;
@ -84,7 +87,7 @@ int zmq::gssapi_client_t::next_handshake_command (msg_t *msg_)
if (initialize_context () < 0) if (initialize_context () < 0)
return -1; return -1;
if (produce_next_token (msg_) < 0) if (produce_next_token (msg_) < 0)
return -1; return -1;
@ -97,7 +100,7 @@ int zmq::gssapi_client_t::next_handshake_command (msg_t *msg_)
} }
else else
state = recv_next_token; state = recv_next_token;
return 0; return 0;
} }
@ -126,7 +129,7 @@ int zmq::gssapi_client_t::process_handshake_command (msg_t *msg_)
errno_assert (msg_->close () == 0); errno_assert (msg_->close () == 0);
errno_assert (msg_->init () == 0); errno_assert (msg_->init () == 0);
return 0; return 0;
} }
@ -163,7 +166,7 @@ int zmq::gssapi_client_t::initialize_context ()
send_tok.length = strlen(service_name); send_tok.length = strlen(service_name);
OM_uint32 maj = gss_import_name(&min_stat, &send_tok, OM_uint32 maj = gss_import_name(&min_stat, &send_tok,
gss_nt_service_name, &target_name); gss_nt_service_name, &target_name);
if (maj != GSS_S_COMPLETE) if (maj != GSS_S_COMPLETE)
return -1; return -1;
} }
@ -175,7 +178,7 @@ int zmq::gssapi_client_t::initialize_context ()
if (token_ptr != GSS_C_NO_BUFFER) if (token_ptr != GSS_C_NO_BUFFER)
free(recv_tok.value); free(recv_tok.value);
return 0; return 0;
} }
@ -213,3 +216,4 @@ int zmq::gssapi_client_t::process_next_token (msg_t *msg_)
return 0; return 0;
} }
#endif