reformat: some nits

Signed-off-by: Gauravsingh Sisodia <xaerru@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>

include/libssh/kex.h

@@ -31,6 +31,7 @@ struct ssh_kex_struct {
     char *methods[SSH_KEX_METHODS];
 };
 
+/* crypto.h needs ssh_kex_struct so it is included below the struct definition */
 #include "libssh/crypto.h"
 
 #ifdef __cplusplus

include/libssh/session.h

@@ -68,7 +68,7 @@ enum ssh_pending_call_e {
     SSH_PENDING_CALL_AUTH_KBDINT_INIT,
     SSH_PENDING_CALL_AUTH_KBDINT_SEND,
     SSH_PENDING_CALL_AUTH_GSSAPI_MIC,
-    SSH_PENDING_CALL_AUTH_GSSAPI_KEYEX
+    SSH_PENDING_CALL_AUTH_GSSAPI_KEYEX,
 };
 
 /* libssh calls may block an undefined amount of time */

src/auth.c

@@ -119,12 +119,14 @@ static const char *ssh_auth_get_current_method(ssh_session session)
     case SSH_AUTH_METHOD_INTERACTIVE:
         method = "keyboard interactive";
         break;
+#ifdef WITH_GSSAPI
     case SSH_AUTH_METHOD_GSSAPI_MIC:
         method = "gssapi";
         break;
     case SSH_AUTH_METHOD_GSSAPI_KEYEX:
         method = "gssapi-keyex";
         break;
+#endif
     default:
         break;
     }
@@ -274,12 +276,14 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_failure) {
     if (strstr(auth_methods, "hostbased") != NULL) {
         session->auth.supported_methods |= SSH_AUTH_METHOD_HOSTBASED;
     }
+#ifdef WITH_GSSAPI
     if (strstr(auth_methods, "gssapi-with-mic") != NULL) {
         session->auth.supported_methods |= SSH_AUTH_METHOD_GSSAPI_MIC;
     }
     if (strstr(auth_methods, "gssapi-keyex") != NULL) {
         session->auth.supported_methods |= SSH_AUTH_METHOD_GSSAPI_KEYEX;
     }
+#endif
 
 end:
     session->auth.current_method = SSH_AUTH_METHOD_UNKNOWN;

src/dh-gss.c

@@ -39,27 +39,27 @@
 static SSH_PACKET_CALLBACK(ssh_packet_client_gss_dh_reply);
 
 static ssh_packet_callback gss_dh_client_callbacks[] = {
-    ssh_packet_client_gss_dh_reply
+    ssh_packet_client_gss_dh_reply,
 };
 
 static struct ssh_packet_callbacks_struct ssh_gss_dh_client_callbacks = {
     .start = SSH2_MSG_KEXGSS_COMPLETE,
     .n_callbacks = 1,
     .callbacks = gss_dh_client_callbacks,
-    .user = NULL
+    .user = NULL,
 };
 
 static SSH_PACKET_CALLBACK(ssh_packet_client_gss_dh_hostkey);
 
 static ssh_packet_callback gss_dh_client_callback_hostkey[] = {
-    ssh_packet_client_gss_dh_hostkey
+    ssh_packet_client_gss_dh_hostkey,
 };
 
 static struct ssh_packet_callbacks_struct ssh_gss_dh_client_callback_hostkey = {
     .start = SSH2_MSG_KEXGSS_HOSTKEY,
     .n_callbacks = 1,
     .callbacks = gss_dh_client_callback_hostkey,
-    .user = NULL
+    .user = NULL,
 };
 
 /** @internal
@@ -285,7 +285,8 @@ static struct ssh_packet_callbacks_struct ssh_gss_dh_server_callbacks = {
     .start = SSH2_MSG_KEXGSS_INIT,
     .n_callbacks = 1,
     .callbacks = gss_dh_server_callbacks,
-    .user = NULL};
+    .user = NULL,
+};
 
 /** @internal
  * @brief sets up the gssapi kex callbacks

src/packet_cb.c

@@ -177,8 +177,8 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys)
         /* server things are done in server.c */
         session->dh_handshake_state=DH_STATE_FINISHED;
     } else {
-        if (session->opts.gssapi_key_exchange) {
 #ifdef WITH_GSSAPI
+        if (session->opts.gssapi_key_exchange) {
             OM_uint32 maj_stat, min_stat;
             gss_buffer_desc mic = GSS_C_EMPTY_BUFFER, msg = GSS_C_EMPTY_BUFFER;
 
@@ -200,8 +200,9 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys)
                 goto error;
             }
             SSH_STRING_FREE(session->gssapi_key_exchange_mic);
+        } else
 #endif
-        } else {
+        {
             ssh_key server_key = NULL;
 
             /* client */