diff options
| author | Andreas Schwab <schwab@suse.de> | 2013-01-10 10:42:56 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2013-01-10 10:44:04 +0100 |
| commit | 33c0a3afc796df20b68b6b130609eb4d74f8e97b (patch) | |
| tree | 06cd32580f1ef7ae71b1050de60ed7bbb5c4058f /nscd/pwdcache.c | |
| parent | 67881f5e929716cd68241d196cb22bdfc564cd32 (diff) | |
| download | glibc-33c0a3afc796df20b68b6b130609eb4d74f8e97b.tar.gz glibc-33c0a3afc796df20b68b6b130609eb4d74f8e97b.tar.xz glibc-33c0a3afc796df20b68b6b130609eb4d74f8e97b.zip | |
Revert "Properly check for short writes when sending the response in nscd"
This reverts commit dd31ac7a8e0d4cc24eee6815f9101caa5aa64291.
Diffstat (limited to 'nscd/pwdcache.c')
| -rw-r--r-- | nscd/pwdcache.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c index bfc183150d..ef492b58c1 100644 --- a/nscd/pwdcache.c +++ b/nscd/pwdcache.c @@ -81,7 +81,6 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, const void *key, struct passwd *pwd, uid_t owner, struct hashentry *const he, struct datahead *dh, int errval) { - bool all_written = true; ssize_t total; ssize_t written; time_t t = time (NULL); @@ -307,7 +306,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, + db->head->data_size)); written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp - - (char *) db->head, dataset->head.recsize); + - (char *) db->head, dataset->head.recsize ); # ifndef __ASSUME_SENDFILE if (written == -1 && errno == ENOSYS) goto use_write; @@ -319,9 +318,6 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, # endif #endif written = writeall (fd, &dataset->resp, dataset->head.recsize); - - if (written != dataset->head.recsize) - all_written = false; } @@ -381,7 +377,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, } } - if (__builtin_expect (!all_written, 0) && debug_level > 0) + if (__builtin_expect (written != total, 0) && debug_level > 0) { char buf[256]; dbg_log (_("short write in %s: %s"), __FUNCTION__, |