generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-14 23:07:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #980 from claws/fix_build_issue_when_missing_gssapi

Browse Source 
Fix build issue when missing gssapi
This commit is contained in:
Pieter Hintjens
2014-04-25 07:10:49 +02:00
parent dd64f6432c 7abf2564f8
commit e37c206211
7 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gssapi_client.cpp
View File

@@ -18,6 +18,9 @@
*/
#include "platform.hpp"
#ifdef HAVE_LIBGSSAPI_KRB5
#ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#endif
@@ -213,3 +216,4 @@ int zmq::gssapi_client_t::process_next_token (msg_t *msg_)
return 0;
}
#endif

4
src/gssapi_client.hpp
View File

@@ -20,6 +20,8 @@
#ifndef __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
#define __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
#ifdef HAVE_LIBGSSAPI_KRB5
#include "gssapi_mechanism_base.hpp"
namespace zmq
@@ -77,3 +79,5 @@ namespace zmq
}
#endif
#endif

4
src/gssapi_mechanism_base.cpp
View File

@@ -18,6 +18,9 @@
*/
#include "platform.hpp"
#ifdef HAVE_LIBGSSAPI_KRB5
#ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#endif
@@ -333,3 +336,4 @@ int zmq::gssapi_mechanism_base_t::acquire_credentials (char * service_name_, gss
return 0;
}
#endif

5
src/gssapi_mechanism_base.hpp
View File

@@ -20,6 +20,10 @@
#ifndef __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_krb5.h>
@@ -113,3 +117,4 @@ namespace zmq
#endif
#endif

4
src/gssapi_server.cpp
View File

@@ -18,6 +18,9 @@
*/
#include "platform.hpp"
#ifdef HAVE_LIBGSSAPI_KRB5
#ifdef ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#endif
@@ -358,3 +361,4 @@ void zmq::gssapi_server_t::accept_context ()
}
}
#endif

4
src/gssapi_server.hpp
View File

@@ -20,6 +20,8 @@
#ifndef __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
#define __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
#ifdef HAVE_LIBGSSAPI_KRB5
#include "gssapi_mechanism_base.hpp"
namespace zmq
@@ -80,3 +82,5 @@ namespace zmq
}
#endif
#endif

2
src/stream_engine.cpp
View File

@@ -595,6 +595,7 @@ bool zmq::stream_engine_t::handshake ()
alloc_assert (mechanism);
}
#endif
#ifdef HAVE_LIBGSSAPI_KRB5
else
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)
@@ -604,6 +605,7 @@ bool zmq::stream_engine_t::handshake ()
mechanism = new (std::nothrow) gssapi_client_t (options);
alloc_assert (mechanism);
}
#endif
else {
error ();
return false;