encrypt option on gss ready

src/gssapi_mechanism_base.cpp

@@ -279,14 +279,19 @@ int zmq::gssapi_mechanism_base_t::produce_ready (msg_t *msg_)
     memcpy (msg_->data (), command_buffer, command_size);
     free (command_buffer);
 
-    return encode_message(msg_);
+    if (do_encryption)
+        return encode_message (msg_);
+
+    return 0;
 }
 
 int zmq::gssapi_mechanism_base_t::process_ready (msg_t *msg_)
 {
-    const int rc = decode_message(msg_);
-    if (rc!=0)
-      return rc;
+    if (do_encryption) { 
+        const int rc = decode_message (msg_);
+        if (rc != 0)
+            return rc;
+    }
 
     const unsigned char *ptr = static_cast <unsigned char *> (msg_->data ());
     size_t bytes_left = msg_->size ();

src/options.cpp

@@ -53,9 +53,9 @@ zmq::options_t::options_t () :
     tcp_keepalive_intvl (-1),
     mechanism (ZMQ_NULL),
     as_server (0),
+    gss_plaintext (false),
     socket_id (0),
-    conflate (false),
-    gss_plaintext (false)
+    conflate (false)
 {
 }