From e5359baeac6e2d49769aceddbdbc606833b1ec69 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Mon, 27 Feb 2012 04:43:34 -0500 Subject: SSH: Add more debugging messages --- src/sss_client/ssh/sss_ssh_authorizedkeys.c | 4 ++++ src/sss_client/ssh/sss_ssh_knownhostsproxy.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'src/sss_client') diff --git a/src/sss_client/ssh/sss_ssh_authorizedkeys.c b/src/sss_client/ssh/sss_ssh_authorizedkeys.c index bc3cdf47..de945422 100644 --- a/src/sss_client/ssh/sss_ssh_authorizedkeys.c +++ b/src/sss_client/ssh/sss_ssh_authorizedkeys.c @@ -99,6 +99,8 @@ int main(int argc, const char **argv) /* look up public keys */ ret = sss_ssh_get_ent(mem_ctx, SSS_SSH_GET_USER_PUBKEYS, user, &ent); if (ret != EOK) { + DEBUG(SSSDBG_CRIT_FAILURE, + ("sss_ssh_get_ent() failed (%d): %s\n", ret, strerror(ret))); ERROR("Error looking up public keys\n"); ret = EXIT_FAILURE; goto fini; @@ -109,6 +111,8 @@ int main(int argc, const char **argv) repr = sss_ssh_format_pubkey(mem_ctx, ent, &ent->pubkeys[i], SSS_SSH_FORMAT_OPENSSH); if (!repr) { + DEBUG(SSSDBG_OP_FAILURE, + ("Out of memory formatting SSH public key\n")); continue; } diff --git a/src/sss_client/ssh/sss_ssh_knownhostsproxy.c b/src/sss_client/ssh/sss_ssh_knownhostsproxy.c index 544ea719..1cfdf24d 100644 --- a/src/sss_client/ssh/sss_ssh_knownhostsproxy.c +++ b/src/sss_client/ssh/sss_ssh_knownhostsproxy.c @@ -136,6 +136,8 @@ connect_socket(const char *host, if (ret == EINTR || ret == EAGAIN) { continue; } + DEBUG(SSSDBG_OP_FAILURE, + ("poll() failed (%d): %s\n", ret, strerror(ret))); goto done; } @@ -149,25 +151,31 @@ connect_socket(const char *host, if (ret == EAGAIN || ret == EINTR || ret == EWOULDBLOCK) { continue; } + DEBUG(SSSDBG_OP_FAILURE, + ("read() failed (%d): %s\n", ret, strerror(ret))); goto done; } else if (res == 0) { - ret = EOK; - goto done; + break; } res = sss_atomic_write(i == 0 ? sock : 1, buffer, res); if (res == -1) { ret = errno; + DEBUG(SSSDBG_OP_FAILURE, + ("sss_atomic_write() failed (%d): %s\n", + ret, strerror(ret))); goto done; } } if (fds[i].revents & POLLHUP) { - ret = EOK; - goto done; + break; } } } + ret = EOK; + DEBUG(SSSDBG_TRACE_FUNC, ("Connection closed\n")); + done: if (ai) freeaddrinfo(ai); if (sock >= 0) close(sock); @@ -274,6 +282,8 @@ int main(int argc, const char **argv) /* look up public keys */ ret = sss_ssh_get_ent(mem_ctx, SSS_SSH_GET_HOST_PUBKEYS, host, &ent); if (ret != EOK) { + DEBUG(SSSDBG_CRIT_FAILURE, + ("sss_ssh_get_ent() failed (%d): %s\n", ret, strerror(ret))); ERROR("Error looking up public keys\n"); } -- cgit