Commit e37c2062 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #980 from claws/fix_build_issue_when_missing_gssapi

Fix build issue when missing gssapi
parents dd64f643 7abf2564
...@@ -18,6 +18,9 @@ ...@@ -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
...@@ -213,3 +216,4 @@ int zmq::gssapi_client_t::process_next_token (msg_t *msg_) ...@@ -213,3 +216,4 @@ int zmq::gssapi_client_t::process_next_token (msg_t *msg_)
return 0; return 0;
} }
#endif
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#ifndef __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__ #ifndef __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
#define __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__ #define __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
#ifdef HAVE_LIBGSSAPI_KRB5
#include "gssapi_mechanism_base.hpp" #include "gssapi_mechanism_base.hpp"
namespace zmq namespace zmq
...@@ -77,3 +79,5 @@ namespace zmq ...@@ -77,3 +79,5 @@ namespace zmq
} }
#endif #endif
#endif
...@@ -18,6 +18,9 @@ ...@@ -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
...@@ -333,3 +336,4 @@ int zmq::gssapi_mechanism_base_t::acquire_credentials (char * service_name_, gss ...@@ -333,3 +336,4 @@ int zmq::gssapi_mechanism_base_t::acquire_credentials (char * service_name_, gss
return 0; return 0;
} }
#endif
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
#ifndef __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__ #ifndef __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
#define __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__ #define __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
#include "platform.hpp"
#ifdef HAVE_LIBGSSAPI_KRB5
#include <gssapi/gssapi_generic.h> #include <gssapi/gssapi_generic.h>
#include <gssapi/gssapi_krb5.h> #include <gssapi/gssapi_krb5.h>
...@@ -113,3 +117,4 @@ namespace zmq ...@@ -113,3 +117,4 @@ namespace zmq
#endif #endif
#endif
...@@ -18,6 +18,9 @@ ...@@ -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
...@@ -358,3 +361,4 @@ void zmq::gssapi_server_t::accept_context () ...@@ -358,3 +361,4 @@ void zmq::gssapi_server_t::accept_context ()
} }
} }
#endif
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#ifndef __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__ #ifndef __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
#define __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__ #define __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
#ifdef HAVE_LIBGSSAPI_KRB5
#include "gssapi_mechanism_base.hpp" #include "gssapi_mechanism_base.hpp"
namespace zmq namespace zmq
...@@ -80,3 +82,5 @@ namespace zmq ...@@ -80,3 +82,5 @@ namespace zmq
} }
#endif #endif
#endif
...@@ -595,6 +595,7 @@ bool zmq::stream_engine_t::handshake () ...@@ -595,6 +595,7 @@ bool zmq::stream_engine_t::handshake ()
alloc_assert (mechanism); alloc_assert (mechanism);
} }
#endif #endif
#ifdef HAVE_LIBGSSAPI_KRB5
else else
if (memcmp (greeting_recv + 12, "GSSAPI\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20) == 0) { if (memcmp (greeting_recv + 12, "GSSAPI\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20) == 0) {
if (options.as_server) if (options.as_server)
...@@ -604,6 +605,7 @@ bool zmq::stream_engine_t::handshake () ...@@ -604,6 +605,7 @@ bool zmq::stream_engine_t::handshake ()
mechanism = new (std::nothrow) gssapi_client_t (options); mechanism = new (std::nothrow) gssapi_client_t (options);
alloc_assert (mechanism); alloc_assert (mechanism);
} }
#endif
else { else {
error (); error ();
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment