mirror of
https://github.com/clearml/dropbear
synced 2025-06-26 18:17:32 +00:00
sync_git_2024.86 tag/DROPBEAR_2024.86
This commit is contained in:
@@ -69,7 +69,8 @@ void read_config_file(char* filename, FILE* config_file, cli_runopts* options) {
|
||||
while (buf_getline(buf, config_file) == DROPBEAR_SUCCESS) {
|
||||
char* commentStart = NULL;
|
||||
cfg_option cfg_opt;
|
||||
int found, i;
|
||||
int found;
|
||||
size_t i;
|
||||
/* Update line number counter. */
|
||||
linenum++;
|
||||
|
||||
|
||||
@@ -317,7 +317,8 @@ static void check_close(struct Channel *channel) {
|
||||
|
||||
if ((channel->recv_eof && !write_pending(channel))
|
||||
/* have a server "session" and child has exited */
|
||||
|| (channel->type->check_close && close_allowed)) {
|
||||
|| (channel->writefd != FD_UNINIT
|
||||
&& channel->type->check_close && close_allowed)) {
|
||||
close_chan_fd(channel, channel->writefd, SHUT_WR);
|
||||
}
|
||||
|
||||
|
||||
@@ -337,7 +337,8 @@ static int checkusername(const char *username, unsigned int userlen) {
|
||||
if (!ses.authstate.pw_name) {
|
||||
TRACE(("leave checkusername: user '%s' doesn't exist", username))
|
||||
dropbear_log(LOG_WARNING,
|
||||
"Login attempt for nonexistent user");
|
||||
"Login attempt for nonexistent user from %s",
|
||||
svr_ses.addrstring);
|
||||
ses.authstate.checkusername_failed = 1;
|
||||
return DROPBEAR_FAILURE;
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ static void main_noinetd(int argc, char ** argv, const char* multipath) {
|
||||
|
||||
if (ses.exitflag) {
|
||||
unlink(svr_opts.pidfile);
|
||||
dropbear_exit("Terminated by signal");
|
||||
dropbear_close("Terminated by signal");
|
||||
}
|
||||
|
||||
if (val == 0) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
*******************************************************************/
|
||||
|
||||
#ifndef DROPBEAR_VERSION
|
||||
#define DROPBEAR_VERSION "2024.85"
|
||||
#define DROPBEAR_VERSION "2024.86"
|
||||
#endif
|
||||
|
||||
/* IDENT_VERSION_PART is the optional part after "SSH-2.0-dropbear". Refer to RFC4253 for requirements. */
|
||||
|
||||
Reference in New Issue
Block a user