diff --git a/RELICENSE/keith-dev.md b/RELICENSE/keith-dev.md new file mode 100644 index 00000000..e2c33a84 --- /dev/null +++ b/RELICENSE/keith-dev.md @@ -0,0 +1,15 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Keith Williams +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other +Open Source Initiative approved license chosen by the current ZeroMQ +BDFL (Benevolent Dictator for Life). + +A portion of the commits made by the Github handle "keith-dev", with +commit author "Keith Williams ", are copyright of Keith Williams. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Keith Williams +2023/04/19 diff --git a/builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake index 6f99f0aa..1c2a36e0 100644 --- a/builds/cmake/Modules/ZMQSourceRunChecks.cmake +++ b/builds/cmake/Modules/ZMQSourceRunChecks.cmake @@ -194,13 +194,14 @@ macro(zmq_check_tcp_tipc) int main(int argc, char *argv []) { struct sockaddr_tipc topsrv; - int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0); + int sd = socket(PF_TIPC, SOCK_SEQPACKET, 0); memset(&topsrv, 0, sizeof(topsrv)); topsrv.family = AF_TIPC; topsrv.addrtype = TIPC_ADDR_NAME; topsrv.addr.name.name.type = TIPC_TOP_SRV; topsrv.addr.name.name.instance = TIPC_TOP_SRV; fcntl(sd, F_SETFL, O_NONBLOCK); + tipc_addr(0, 0, 0); } " ZMQ_HAVE_TIPC) diff --git a/tests/test_wss_transport.cpp b/tests/test_wss_transport.cpp index 7865ab67..64165ab4 100644 --- a/tests/test_wss_transport.cpp +++ b/tests/test_wss_transport.cpp @@ -124,7 +124,7 @@ const char *cert = void test_roundtrip () { - char connect_address[MAX_SOCKET_STRING + strlen ("/roundtrip")]; + char connect_address[MAX_SOCKET_STRING + sizeof ("/roundtrip") - 1]; size_t addr_length = sizeof (connect_address); void *sb = test_context_socket (ZMQ_REP); zmq_setsockopt (sb, ZMQ_WSS_CERT_PEM, cert, strlen (cert));