diff options
Diffstat (limited to 'src/sss_client')
| -rw-r--r-- | src/sss_client/common.c | 16 | ||||
| -rw-r--r-- | src/sss_client/pam_sss.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/sss_client/common.c b/src/sss_client/common.c index 237b90aba..a4856e088 100644 --- a/src/sss_client/common.c +++ b/src/sss_client/common.c @@ -123,6 +123,7 @@ static enum nss_status sss_nss_send_req(enum sss_cli_command cmd, return NSS_STATUS_UNAVAIL; } + errno = 0; if (datasent < SSS_NSS_HEADER_SIZE) { res = write(sss_cli_sd, (char *)header + datasent, @@ -133,8 +134,15 @@ static enum nss_status sss_nss_send_req(enum sss_cli_command cmd, (const char *)rd->data + rdsent, rd->len - rdsent); } + error = errno; if ((res == -1) || (res == 0)) { + if ((error == EINTR) || error == EAGAIN) { + /* If the write was interrupted, go back through + * the loop and try again + */ + continue; + } /* Write failed */ sss_cli_close_socket(); @@ -217,6 +225,7 @@ static enum nss_status sss_nss_recv_rep(enum sss_cli_command cmd, return NSS_STATUS_UNAVAIL; } + errno = 0; if (datarecv < SSS_NSS_HEADER_SIZE) { res = read(sss_cli_sd, (char *)header + datarecv, @@ -227,8 +236,15 @@ static enum nss_status sss_nss_recv_rep(enum sss_cli_command cmd, (char *)(*buf) + bufrecv, header[0] - datarecv); } + error = errno; if ((res == -1) || (res == 0)) { + if ((error == EINTR) || error == EAGAIN) { + /* If the read was interrupted, go back through + * the loop and try again + */ + continue; + } /* Read failed. I think the only useful thing * we can do here is just return -1 and fail diff --git a/src/sss_client/pam_sss.c b/src/sss_client/pam_sss.c index 2faa3ad2e..644073f5b 100644 --- a/src/sss_client/pam_sss.c +++ b/src/sss_client/pam_sss.c @@ -489,7 +489,7 @@ static errno_t display_pw_reset_message(pam_handle_t *pamh, while (total_len < stat_buf.st_size) { ret = read(fd, msg_buf + total_len, stat_buf.st_size - total_len); if (ret == -1) { - if (errno == EINTR) continue; + if (errno == EINTR || errno == EAGAIN) continue; ret = errno; D(("read failed [%d][%s].", ret, strerror(ret))); goto done; |