mirror of
https://github.com/clearml/dropbear
synced 2025-04-09 07:06:39 +00:00
changed TRACE to DEBUG1 for dbclient
This commit is contained in:
parent
9ea30b8932
commit
1f169dafa8
@ -85,7 +85,6 @@ 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 (cli_opts.quiet == 0) {
|
|
||||||
if (bannerlen > MAX_BANNER_SIZE) {
|
if (bannerlen > MAX_BANNER_SIZE) {
|
||||||
TRACE(("recv_msg_userauth_banner: bannerlen too long: %d", bannerlen))
|
TRACE(("recv_msg_userauth_banner: bannerlen too long: %d", bannerlen))
|
||||||
truncated = 1;
|
truncated = 1;
|
||||||
@ -110,7 +109,7 @@ void recv_msg_userauth_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"))
|
||||||
}
|
}
|
||||||
@ -261,7 +260,7 @@ void recv_msg_userauth_success() {
|
|||||||
/* This function can validly get called multiple times
|
/* This function can validly get called multiple times
|
||||||
if DROPBEAR_CLI_IMMEDIATE_AUTH is set */
|
if DROPBEAR_CLI_IMMEDIATE_AUTH is set */
|
||||||
|
|
||||||
TRACE(("received msg_userauth_success"))
|
DEBUG1(("received msg_userauth_success"))
|
||||||
if (cli_opts.disable_trivial_auth && cli_ses.is_trivial_auth) {
|
if (cli_opts.disable_trivial_auth && cli_ses.is_trivial_auth) {
|
||||||
dropbear_exit("trivial authentication not allowed");
|
dropbear_exit("trivial authentication not allowed");
|
||||||
}
|
}
|
||||||
|
@ -120,7 +120,7 @@ void cli_auth_password() {
|
|||||||
char* password = NULL;
|
char* password = NULL;
|
||||||
char prompt[80];
|
char prompt[80];
|
||||||
|
|
||||||
TRACE(("enter cli_auth_password"))
|
DEBUG1(("enter cli_auth_password"))
|
||||||
CHECKCLEARTOWRITE();
|
CHECKCLEARTOWRITE();
|
||||||
|
|
||||||
snprintf(prompt, sizeof(prompt), "%s@%s's password: ",
|
snprintf(prompt, sizeof(prompt), "%s@%s's password: ",
|
||||||
|
@ -147,7 +147,7 @@ static void send_msg_userauth_pubkey(sign_key *key, enum signature_type sigtype,
|
|||||||
buffer* sigbuf = NULL;
|
buffer* sigbuf = NULL;
|
||||||
enum signkey_type keytype = signkey_type_from_signature(sigtype);
|
enum signkey_type keytype = signkey_type_from_signature(sigtype);
|
||||||
|
|
||||||
TRACE(("enter send_msg_userauth_pubkey sigtype %d", sigtype))
|
DEBUG1(("enter send_msg_userauth_pubkey %s", signkey_name_from_type(sigtype,NULL)))
|
||||||
CHECKCLEARTOWRITE();
|
CHECKCLEARTOWRITE();
|
||||||
|
|
||||||
buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);
|
buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);
|
||||||
|
@ -65,8 +65,12 @@ int main(int argc, char ** argv) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
TRACE(("user='%s' host='%s' port='%s' bind_address='%s' bind_port='%s'", cli_opts.username,
|
if (cli_opts.bind_address) {
|
||||||
|
DEBUG1(("connect to: user=%s host=%s/%s bind_address=%s:%s", cli_opts.username,
|
||||||
cli_opts.remotehost, cli_opts.remoteport, cli_opts.bind_address, cli_opts.bind_port))
|
cli_opts.remotehost, cli_opts.remoteport, cli_opts.bind_address, cli_opts.bind_port))
|
||||||
|
} else {
|
||||||
|
DEBUG1(("connect to: user=%s host=%s/%s",cli_opts.username,cli_opts.remotehost,cli_opts.remoteport))
|
||||||
|
}
|
||||||
|
|
||||||
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
|
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
|
||||||
dropbear_exit("signal() error");
|
dropbear_exit("signal() error");
|
||||||
@ -135,6 +139,7 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
|
|||||||
|
|
||||||
ret = spawn_command(exec_proxy_cmd, ex_cmd,
|
ret = spawn_command(exec_proxy_cmd, ex_cmd,
|
||||||
sock_out, sock_in, NULL, pid_out);
|
sock_out, sock_in, NULL, pid_out);
|
||||||
|
DEBUG1(("cmd: %s pid=%d", ex_cmd,*pid_out))
|
||||||
m_free(ex_cmd);
|
m_free(ex_cmd);
|
||||||
if (ret == DROPBEAR_FAILURE) {
|
if (ret == DROPBEAR_FAILURE) {
|
||||||
dropbear_exit("Failed running proxy command");
|
dropbear_exit("Failed running proxy command");
|
||||||
|
@ -102,7 +102,7 @@ void cli_connected(int result, int sock, void* userdata, const char *errstring)
|
|||||||
dropbear_exit("Connect failed: %s", errstring);
|
dropbear_exit("Connect failed: %s", errstring);
|
||||||
}
|
}
|
||||||
myses->sock_in = myses->sock_out = sock;
|
myses->sock_in = myses->sock_out = sock;
|
||||||
TRACE(("cli_connected"))
|
DEBUG1(("cli_connected"))
|
||||||
ses.socket_prio = DROPBEAR_PRIO_NORMAL;
|
ses.socket_prio = DROPBEAR_PRIO_NORMAL;
|
||||||
/* switches to lowdelay */
|
/* switches to lowdelay */
|
||||||
update_channel_prio();
|
update_channel_prio();
|
||||||
|
@ -404,7 +404,7 @@ static void read_session_identification() {
|
|||||||
dropbear_exit("Incompatible remote version '%s'", ses.remoteident);
|
dropbear_exit("Incompatible remote version '%s'", ses.remoteident);
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACE(("remoteident: %s", ses.remoteident))
|
DEBUG1(("remoteident: %s", ses.remoteident))
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user