Skip to content

Commit e4b3bd8

Browse files
committed
Problem: cannot set ZAP_ENFORCE_DOMAIN in testutil's wrappers
Solution: override unused parameter for NULL wrapper
1 parent 7722381 commit e4b3bd8

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

tests/testutil_security.hpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,17 @@ void socket_config_null_client (void *server, void *server_secret)
4747

4848
void socket_config_null_server (void *server, void *server_secret)
4949
{
50-
LIBZMQ_UNUSED (server_secret);
51-
5250
int rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, test_zap_domain,
5351
strlen (test_zap_domain));
5452
assert (rc == 0);
53+
#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
54+
int required = server_secret ? *(int *) server_secret : 0;
55+
rc =
56+
zmq_setsockopt (server, ZMQ_ZAP_ENFORCE_DOMAIN, &required, sizeof (int));
57+
assert (rc == 0);
58+
#else
59+
LIBZMQ_UNUSED (server_secret);
60+
#endif
5561
}
5662

5763
// PLAIN specific functions

0 commit comments

Comments
 (0)