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

Problem: when libgssapi isn't available, GSSAPI options 'seem' to work

Browse Source 
Solution: use same approach as for libsodium/CURVE, i.e. return EINVAL
if the library isn't present when libzmq builds, and the application
still tries to use these options in zmq_getsockopt/setsockopt.
This commit is contained in:
Pieter Hintjens
2014-06-17 16:32:47 +02:00
parent 1beb54cef0
commit 27547bc9bc
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/options.cpp
View File

@@ -403,7 +403,9 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0; return 0;
} }
break; break;
// If libgssapi isn't installed, these options provoke EINVAL
# ifdef HAVE_LIBGSSAPI_KRB5
case ZMQ_GSSAPI_SERVER: case ZMQ_GSSAPI_SERVER:
if (is_int && (value == 0 || value == 1)) { if (is_int && (value == 0 || value == 1)) {
as_server = value; as_server = value;
@@ -411,7 +413,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0; return 0;
} }
break; break;
case ZMQ_GSSAPI_PRINCIPAL: case ZMQ_GSSAPI_PRINCIPAL:
if (optvallen_ > 0 && optvallen_ < 256 && optval_ != NULL) { if (optvallen_ > 0 && optvallen_ < 256 && optval_ != NULL) {
gss_principal.assign ((const char *) optval_, optvallen_); gss_principal.assign ((const char *) optval_, optvallen_);
@@ -435,7 +437,8 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0; return 0;
} }
break; break;
# endif
case ZMQ_HANDSHAKE_IVL: case ZMQ_HANDSHAKE_IVL:
if (is_int && value >= 0) { if (is_int && value >= 0) {
handshake_ivl = value; handshake_ivl = value;
@@ -741,6 +744,8 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
} }
break; break;
// If libgssapi isn't installed, these options provoke EINVAL
# ifdef HAVE_LIBGSSAPI_KRB5
case ZMQ_GSSAPI_SERVER: case ZMQ_GSSAPI_SERVER:
if (is_int) { if (is_int) {
*value = as_server && mechanism == ZMQ_GSSAPI; *value = as_server && mechanism == ZMQ_GSSAPI;
@@ -770,7 +775,8 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
return 0; return 0;
} }
break; break;
#endif
case ZMQ_HANDSHAKE_IVL: case ZMQ_HANDSHAKE_IVL:
if (is_int) { if (is_int) {
*value = handshake_ivl; *value = handshake_ivl;