From 8d9026666190eecc55548899461b83a4f6cf45ce Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 23 Nov 2018 15:32:14 +0100 Subject: [PATCH] server: Reformat ssh_auth_reply_success Signed-off-by: Jakub Jelen Reviewed-by: Daiki Ueno Reviewed-by: Andreas Schneider --- src/server.c | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/src/server.c b/src/server.c index 8197fd86..186d877c 100644 --- a/src/server.c +++ b/src/server.c @@ -1046,34 +1046,38 @@ int ssh_message_auth_interactive_request(ssh_message msg, const char *name, return rc; } -int ssh_auth_reply_success(ssh_session session, int partial) { - int r; +int ssh_auth_reply_success(ssh_session session, int partial) +{ + int r; - if (session == NULL) { - return SSH_ERROR; - } + if (session == NULL) { + return SSH_ERROR; + } - if (partial) { - return ssh_auth_reply_default(session, partial); - } - - session->session_state = SSH_SESSION_STATE_AUTHENTICATED; - session->flags |= SSH_SESSION_FLAG_AUTHENTICATED; + if (partial) { + return ssh_auth_reply_default(session, partial); + } - if (ssh_buffer_add_u8(session->out_buffer,SSH2_MSG_USERAUTH_SUCCESS) < 0) { - return SSH_ERROR; - } + session->session_state = SSH_SESSION_STATE_AUTHENTICATED; + session->flags |= SSH_SESSION_FLAG_AUTHENTICATED; - r = ssh_packet_send(session); - if(session->current_crypto && session->current_crypto->delayed_compress_out){ - SSH_LOG(SSH_LOG_PROTOCOL,"Enabling delayed compression OUT"); - session->current_crypto->do_compress_out=1; - } - if(session->current_crypto && session->current_crypto->delayed_compress_in){ - SSH_LOG(SSH_LOG_PROTOCOL,"Enabling delayed compression IN"); - session->current_crypto->do_compress_in=1; - } - return r; + r = ssh_buffer_add_u8(session->out_buffer,SSH2_MSG_USERAUTH_SUCCESS); + if (r < 0) { + return SSH_ERROR; + } + + r = ssh_packet_send(session); + + if (session->current_crypto && session->current_crypto->delayed_compress_out) { + SSH_LOG(SSH_LOG_PROTOCOL, "Enabling delayed compression OUT"); + session->current_crypto->do_compress_out = 1; + } + + if (session->current_crypto && session->current_crypto->delayed_compress_in) { + SSH_LOG(SSH_LOG_PROTOCOL, "Enabling delayed compression IN"); + session->current_crypto->do_compress_in = 1; + } + return r; } int ssh_message_auth_reply_success(ssh_message msg, int partial) {