gssapi: renumber socket options

Problem: GSSAPI NAMETYPE socket option numbers were modified
+1000 when moved to DRAFT section, but should use the definitive
values while in DRAFT to minimize disruption later.

Solution: renumber the socket options

include/zmq.h

@@ -635,8 +635,8 @@ ZMQ_EXPORT int   zmq_timers_execute (void *timers);
 /*  GSSAPI socket options to set name type                                    */
 /******************************************************************************/
 
-#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 1090
-#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 1091
+#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
 
 /*  GSSAPI principal name types                                               */
 #define ZMQ_GSSAPI_NT_HOSTBASED 0

src/zmq_draft.h

@@ -120,8 +120,8 @@ int   zmq_timers_execute (void *timers);
 /*  GSSAPI socket options to set name type                                    */
 /******************************************************************************/
 
-#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 1090
-#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 1091
+#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
 
 /*  GSSAPI principal name types                                               */
 #define ZMQ_GSSAPI_NT_HOSTBASED 0