Skip to content

Commit 733c0bd

Browse files
committed
server session MAINTENANCE formatting and minor problems
1 parent 85744b2 commit 733c0bd

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/session_server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ void nc_server_ssh_set_passwd_auth_clb(int (*passwd_auth_clb)(const struct nc_se
521521
* @param[in] user_data Optional arbitrary user data that will be passed to \p passwd_auth_clb.
522522
* @param[in] free_user_data Optional callback that will be called during cleanup to free any \p user_data.
523523
*/
524-
void ncserver_ssh_set_interactive_auth_clb(int (*interactive_auth_clb)(const struct nc_session *session, const struct ssh_message msg,
524+
void ncserver_ssh_set_interactive_auth_clb(int (*interactive_auth_clb)(const struct nc_session *session, const ssh_message msg,
525525
void *user_data),
526526
void *user_data, void (*free_user_data)(void *user_data));
527527

src/session_server_ssh.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ nc_server_ssh_set_interactive_auth_clb(int (*interactive_auth_clb)(const struct
150150
server_opts.interactive_auth_data = user_data;
151151
server_opts.interactive_auth_data_free = free_user_data;
152152
}
153-
153+
154154
API void
155155
nc_server_ssh_set_pubkey_auth_clb(int (*pubkey_auth_clb)(const struct nc_session *session, ssh_key key, void *user_data),
156156
void *user_data, void (*free_user_data)(void *user_data))
@@ -848,7 +848,7 @@ nc_sshcb_auth_kbdint(struct nc_session *session, ssh_message msg)
848848
char *pass_hash;
849849

850850
if (server_opts.interactive_auth_clb) {
851-
auth_ret = server_opts.interactive_auth_clb(session, msg, server_opts.interactive_auth_data);
851+
auth_ret = server_opts.interactive_auth_clb(session, msg, server_opts.interactive_auth_data);
852852
} else {
853853
if (!ssh_message_auth_kbdint_is_response(msg)) {
854854
const char *prompts[] = {"Password: "};
@@ -939,12 +939,11 @@ nc_sshcb_auth_pubkey(struct nc_session *session, ssh_message msg)
939939
const char *username;
940940
int signature_state;
941941

942-
if(server_opts.pubkey_auth_clb){
943-
if(server_opts.pubkey_auth_clb(session, ssh_message_auth_pubkey(msg), server_opts.pubkey_auth_data)){
942+
if (server_opts.pubkey_auth_clb) {
943+
if (server_opts.pubkey_auth_clb(session, ssh_message_auth_pubkey(msg), server_opts.pubkey_auth_data)) {
944944
goto fail;
945945
}
946-
}
947-
else{
946+
} else {
948947
if ((username = auth_pubkey_compare_key(ssh_message_auth_pubkey(msg))) == NULL) {
949948
VRB("User \"%s\" tried to use an unknown (unauthorized) public key.", session->username);
950949
goto fail;

0 commit comments

Comments
 (0)