only show banner when cli_opts.quiet is not set

This commit is contained in:
HansH111 2022-03-13 14:21:13 +00:00 committed by Matt Johnston
parent 360d60fb34
commit 488ffce133

View File

@ -85,31 +85,32 @@ void recv_msg_userauth_banner() {
banner = buf_getstring(ses.payload, &bannerlen); banner = buf_getstring(ses.payload, &bannerlen);
buf_eatstring(ses.payload); /* The language string */ buf_eatstring(ses.payload); /* The language string */
if (bannerlen > MAX_BANNER_SIZE) { if (cli_opts.quiet == 0) {
TRACE(("recv_msg_userauth_banner: bannerlen too long: %d", bannerlen)) if (bannerlen > MAX_BANNER_SIZE) {
truncated = 1; TRACE(("recv_msg_userauth_banner: bannerlen too long: %d", bannerlen))
} else { truncated = 1;
cleantext(banner); } else {
cleantext(banner);
/* Limit to 24 lines */ /* Limit to 24 lines */
linecount = 1; linecount = 1;
for (i = 0; i < bannerlen; i++) { for (i = 0; i < bannerlen; i++) {
if (banner[i] == '\n') { if (banner[i] == '\n') {
if (linecount >= MAX_BANNER_LINES) { if (linecount >= MAX_BANNER_LINES) {
banner[i] = '\0'; banner[i] = '\0';
truncated = 1; truncated = 1;
break; break;
}
linecount++;
} }
linecount++;
} }
fprintf(stderr, "%s\n", banner);
} }
fprintf(stderr, "%s\n", banner);
}
if (truncated) { if (truncated) {
fprintf(stderr, "[Banner from the server is too long]\n"); fprintf(stderr, "[Banner from the server is too long]\n");
}
} }
m_free(banner); m_free(banner);
TRACE(("leave recv_msg_userauth_banner")) TRACE(("leave recv_msg_userauth_banner"))
} }