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/servicescache.c | |
| parent | 67881f5e929716cd68241d196cb22bdfc564cd32 (diff) | |
| download | glibc-33c0a3afc796df20b68b6b130609eb4d74f8e97b.zip glibc-33c0a3afc796df20b68b6b130609eb4d74f8e97b.tar.gz glibc-33c0a3afc796df20b68b6b130609eb4d74f8e97b.tar.bz2 | |
Revert "Properly check for short writes when sending the response in nscd"
This reverts commit dd31ac7a8e0d4cc24eee6815f9101caa5aa64291.
Diffstat (limited to 'nscd/servicescache.c')
| -rw-r--r-- | nscd/servicescache.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nscd/servicescache.c b/nscd/servicescache.c index b16f9e5..d29cde7 100644 --- a/nscd/servicescache.c +++ b/nscd/servicescache.c @@ -65,7 +65,6 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, const void *key, struct servent *serv, 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); @@ -291,14 +290,14 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, { assert (db->wr_fd != -1); assert ((char *) &dataset->resp > (char *) db->data); - assert ((char *) dataset - (char *) db->head + assert ((char *) &dataset->resp - (char *) db->head + total <= (sizeof (struct database_pers_head) + db->head->module * sizeof (ref_t) + db->head->data_size)); written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp - - (char *) db->head, dataset->head.recsize); + - (char *) db->head, total); # ifndef __ASSUME_SENDFILE if (written == -1 && errno == ENOSYS) goto use_write; @@ -309,10 +308,7 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, use_write: # endif #endif - written = writeall (fd, &dataset->resp, dataset->head.recsize); - - if (written != dataset->head.recsize) - all_written = false; + written = writeall (fd, &dataset->resp, total); } /* Add the record to the database. But only if it has not been @@ -336,7 +332,7 @@ cache_addserv (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__, |