aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wedderwille <davidwe@posteo.de>2019-05-26 22:27:40 +0200
committerAndreas Schneider <asn@cryptomilk.org>2019-06-13 16:43:44 +0200
commit32eec7b418874462326fed7f10b9602bf92405f1 (patch)
treefa70cc9e4f1b537be0ab6553c2578d1a0f623987
parent1f43b52117fc97eef95e3627517cadb531b2b43e (diff)
downloadlibssh-32eec7b418874462326fed7f10b9602bf92405f1.tar.gz
libssh-32eec7b418874462326fed7f10b9602bf92405f1.tar.xz
libssh-32eec7b418874462326fed7f10b9602bf92405f1.zip
SSH_LOG: Adjust log level from SSH_LOG_WARNING to SSH_LOG_PROTOCOL
Fixes T149 Signed-off-by: David Wedderwille <davidwe@posteo.de> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--src/client.c2
-rw-r--r--src/misc.c4
-rw-r--r--src/server.c2
-rw-r--r--src/sftp.c14
4 files changed, 11 insertions, 11 deletions
diff --git a/src/client.c b/src/client.c
index a64a6040..a1b587f7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -399,7 +399,7 @@ static void ssh_client_connection_callback(ssh_session session)
goto error;
}
set_status(session, 0.4f);
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"SSH server banner: %s", session->serverbanner);
/* Here we analyze the different protocols the server allows. */
diff --git a/src/misc.c b/src/misc.c
index a0006696..0c6b570c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -944,7 +944,7 @@ int ssh_analyze_banner(ssh_session session, int server)
return -1;
}
- SSH_LOG(SSH_LOG_RARE, "Analyzing banner: %s", banner);
+ SSH_LOG(SSH_LOG_PROTOCOL, "Analyzing banner: %s", banner);
switch (banner[4]) {
case '2':
@@ -994,7 +994,7 @@ int ssh_analyze_banner(ssh_session session, int server)
session->openssh = SSH_VERSION_INT(((int) major), ((int) minor), 0);
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"We are talking to an OpenSSH client version: %lu.%lu (%x)",
major, minor, session->openssh);
}
diff --git a/src/server.c b/src/server.c
index 11cc78f0..9256c30a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -336,7 +336,7 @@ static void ssh_server_connection_callback(ssh_session session){
goto error;
}
set_status(session, 0.4f);
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"SSH client banner: %s", session->clientbanner);
/* Here we analyze the different protocols the server allows. */
diff --git a/src/sftp.c b/src/sftp.c
index 55d42586..d2231039 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -288,7 +288,7 @@ int sftp_server_init(sftp_session sftp){
}
ssh_buffer_free(reply);
- SSH_LOG(SSH_LOG_RARE, "Server version sent");
+ SSH_LOG(SSH_LOG_PROTOCOL, "Server version sent");
if (version > LIBSFTP_VERSION) {
sftp->version = LIBSFTP_VERSION;
@@ -678,7 +678,7 @@ int sftp_init(sftp_session sftp) {
sftp_set_error(sftp, SSH_FX_FAILURE);
return -1;
}
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"SFTP server version %d",
version);
rc = ssh_buffer_unpack(packet->payload, "s", &ext_name);
@@ -691,7 +691,7 @@ int sftp_init(sftp_session sftp) {
break;
}
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"SFTP server extension: %s, version: %s",
ext_name, ext_data);
@@ -1324,7 +1324,7 @@ static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
if (rc != SSH_OK){
goto error;
}
- SSH_LOG(SSH_LOG_RARE, "Name: %s", attr->name);
+ SSH_LOG(SSH_LOG_PROTOCOL, "Name: %s", attr->name);
/* Set owner and group if we talk to openssh and have the longname */
if (ssh_get_openssh_version(sftp->session)) {
@@ -1344,7 +1344,7 @@ static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
if (rc != SSH_OK){
goto error;
}
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"Flags: %.8lx\n", (long unsigned int) attr->flags);
if (attr->flags & SSH_FILEXFER_ATTR_SIZE) {
@@ -1352,7 +1352,7 @@ static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
if(rc != SSH_OK) {
goto error;
}
- SSH_LOG(SSH_LOG_RARE,
+ SSH_LOG(SSH_LOG_PROTOCOL,
"Size: %llu\n",
(long long unsigned int) attr->size);
}
@@ -1613,7 +1613,7 @@ sftp_attributes sftp_readdir(sftp_session sftp, sftp_dir dir)
return NULL;
}
- SSH_LOG(SSH_LOG_RARE, "Count is %d", dir->count);
+ SSH_LOG(SSH_LOG_PROTOCOL, "Count is %d", dir->count);
attr = sftp_parse_attr(sftp, dir->buffer, 1);
if (attr == NULL) {