From c8097af8842502a3e545fa6c9e2e1b11b3062f0f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 19 Aug 2017 17:32:02 +0100 Subject: [PATCH] Problem: DRAFT GSSAPI socket options in wrong section cause duplication Solution: move them together with the other DRAFT socket options, and change value of DRAFT ZMQ_BINDTODEVICE from 90 to 92 to avoid clash --- include/zmq.h | 9 ++++----- src/zmq_draft.h | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index 71cc111d..62318fbd 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -565,7 +565,9 @@ ZMQ_EXPORT void zmq_threadclose (void* thread); #define ZMQ_DGRAM 18 /* DRAFT Socket options. */ -#define ZMQ_BINDTODEVICE 90 +#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90 +#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91 +#define ZMQ_BINDTODEVICE 92 /* DRAFT 0MQ socket events and monitoring */ /* Unspecified system errors during handshake. Event value is an errno. */ @@ -677,12 +679,9 @@ ZMQ_EXPORT long zmq_timers_timeout (void *timers); ZMQ_EXPORT int zmq_timers_execute (void *timers); /******************************************************************************/ -/* GSSAPI socket options to set name type */ +/* GSSAPI definitions */ /******************************************************************************/ -#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90 -#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91 - /* GSSAPI principal name types */ #define ZMQ_GSSAPI_NT_HOSTBASED 0 #define ZMQ_GSSAPI_NT_USER_NAME 1 diff --git a/src/zmq_draft.h b/src/zmq_draft.h index a4df3db1..c0a88980 100644 --- a/src/zmq_draft.h +++ b/src/zmq_draft.h @@ -47,7 +47,9 @@ #define ZMQ_DGRAM 18 /* DRAFT Socket options. */ -#define ZMQ_BINDTODEVICE 90 +#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90 +#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91 +#define ZMQ_BINDTODEVICE 92 /* DRAFT 0MQ socket events and monitoring */ /* Unspecified system errors during handshake. Event value is an errno. */ @@ -155,12 +157,9 @@ long zmq_timers_timeout (void *timers); int zmq_timers_execute (void *timers); /******************************************************************************/ -/* GSSAPI socket options to set name type */ +/* GSSAPI definitions */ /******************************************************************************/ -#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90 -#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91 - /* GSSAPI principal name types */ #define ZMQ_GSSAPI_NT_HOSTBASED 0 #define ZMQ_GSSAPI_NT_USER_NAME 1