diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2012-03-20 10:34:55 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-03-20 11:40:15 -0400 |
| commit | c8d2e61f2f9774c48506e386b29bbfbb003a923b (patch) | |
| tree | 9c296ff4d2ff9a7f2e7b04e6409ce2ee19d294fa | |
| parent | 21bbf10df9fc7a822a644e80e275a40564c105a5 (diff) | |
| download | sssd-c8d2e61f2f9774c48506e386b29bbfbb003a923b.tar.gz sssd-c8d2e61f2f9774c48506e386b29bbfbb003a923b.tar.xz sssd-c8d2e61f2f9774c48506e386b29bbfbb003a923b.zip | |
SSH: Fix infinite loop in sss_ssh_knownhostsproxy
https://fedorahosted.org/sssd/ticket/1268
| -rw-r--r-- | src/sss_client/ssh/sss_ssh_knownhostsproxy.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/sss_client/ssh/sss_ssh_knownhostsproxy.c b/src/sss_client/ssh/sss_ssh_knownhostsproxy.c index 1e4a934ea..8a0107282 100644 --- a/src/sss_client/ssh/sss_ssh_knownhostsproxy.c +++ b/src/sss_client/ssh/sss_ssh_knownhostsproxy.c @@ -135,27 +135,30 @@ connect_socket(int family, struct sockaddr *addr, size_t addr_len) ("read() failed (%d): %s\n", ret, strerror(ret))); goto done; } else if (res == 0) { - break; + ret = EOK; + goto done; } + errno = 0; res = sss_atomic_write(i == 0 ? sock : 1, buffer, res); + ret = errno; if (res == -1) { - ret = errno; DEBUG(SSSDBG_OP_FAILURE, ("sss_atomic_write() failed (%d): %s\n", ret, strerror(ret))); goto done; + } else if (ret == EPIPE) { + ret = EOK; + goto done; } } if (fds[i].revents & POLLHUP) { - break; + ret = EOK; + goto done; } } } - ret = EOK; - DEBUG(SSSDBG_TRACE_FUNC, ("Connection closed\n")); - done: if (sock >= 0) close(sock); |