mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-12 19:20:27 +09:00
Rewrite strerror to ssh_strerror
Signed-off-by: Norbert Pocs <npocs@redhat.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
committed by
Jakub Jelen
parent
c437ba5c28
commit
594608f21b
@@ -516,10 +516,12 @@ int ssh_write_knownhost(ssh_session session)
|
|||||||
errno = 0;
|
errno = 0;
|
||||||
file = fopen(session->opts.knownhosts, "a");
|
file = fopen(session->opts.knownhosts, "a");
|
||||||
if (file == NULL) {
|
if (file == NULL) {
|
||||||
|
char err_msg[SSH_ERRNO_MSG_MAX] = {0};
|
||||||
if (errno == ENOENT) {
|
if (errno == ENOENT) {
|
||||||
dir = ssh_dirname(session->opts.knownhosts);
|
dir = ssh_dirname(session->opts.knownhosts);
|
||||||
if (dir == NULL) {
|
if (dir == NULL) {
|
||||||
ssh_set_error(session, SSH_FATAL, "%s", strerror(errno));
|
ssh_set_error(session, SSH_FATAL,
|
||||||
|
"%s", ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -527,7 +529,7 @@ int ssh_write_knownhost(ssh_session session)
|
|||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Cannot create %s directory: %s",
|
"Cannot create %s directory: %s",
|
||||||
dir, strerror(errno));
|
dir, ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
||||||
SAFE_FREE(dir);
|
SAFE_FREE(dir);
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
@@ -539,13 +541,15 @@ int ssh_write_knownhost(ssh_session session)
|
|||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Couldn't open known_hosts file %s"
|
"Couldn't open known_hosts file %s"
|
||||||
" for appending: %s",
|
" for appending: %s",
|
||||||
session->opts.knownhosts, strerror(errno));
|
session->opts.knownhosts,
|
||||||
|
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Couldn't open known_hosts file %s for appending: %s",
|
"Couldn't open known_hosts file %s for appending: %s",
|
||||||
session->opts.knownhosts, strerror(errno));
|
session->opts.knownhosts,
|
||||||
|
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user