generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-28 19:52:00 +01:00
Code Issues Projects Releases Wiki Activity

gssapi: drop unnecessary ifdefs

Browse Source 
Problem: GSSAPI DRAFT code was made conditional on
ZMQ_BUILD_DRAFT_API, but zmq_draft.h duplicates the DRAFT
symbols definitions from zmq.h so this is unnecessary.

Solution: drop the extra ifdefs
This commit is contained in:
Jim Garlick
2017-04-25 10:07:58 -07:00
parent c978d3bb0a
commit 53918fc115
5 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/options.cpp
View File

@@ -69,10 +69,8 @@ zmq::options_t::options_t () :
tcp_keepalive_intvl (-1),
mechanism (ZMQ_NULL),
as_server (0),
#ifdef ZMQ_BUILD_DRAFT_API
gss_principal_nt (ZMQ_GSSAPI_NT_HOSTBASED),
gss_service_principal_nt (ZMQ_GSSAPI_NT_HOSTBASED),
#endif
gss_plaintext (false),
socket_id (0),
conflate (false),
@@ -513,7 +511,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0;
}
break;
#ifdef ZMQ_BUILD_DRAFT_API
case ZMQ_GSSAPI_PRINCIPAL_NAMETYPE:
if (is_int && (value == ZMQ_GSSAPI_NT_HOSTBASED
|| value == ZMQ_GSSAPI_NT_USER_NAME
@@ -522,6 +520,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0;
}
break;
case ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE:
if (is_int && (value == ZMQ_GSSAPI_NT_HOSTBASED
|| value == ZMQ_GSSAPI_NT_USER_NAME
@@ -530,7 +529,6 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0;
}
break;
#endif
#endif
case ZMQ_HANDSHAKE_IVL:
@@ -965,7 +963,7 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
return 0;
}
break;
#ifdef ZMQ_BUILD_DRAFT_API
case ZMQ_GSSAPI_PRINCIPAL_NAMETYPE:
if (is_int) {
*value = gss_principal_nt;
@@ -978,7 +976,6 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
return 0;
}
break;
#endif
#endif
case ZMQ_HANDSHAKE_IVL: