AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Properly check for short writes when sending the response in nscd"

Browse Source 
This reverts commit dd31ac7a8e.
This commit is contained in:
Andreas Schwab 2013-01-10 10:42:56 +01:00
parent 67881f5e92
commit 33c0a3afc7
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nscd/grpcache.c
View File

@ -75,7 +75,6 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
const void *key, struct group *grp, 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);
@ -343,9 +342,6 @@ cache_addgr (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;
}
/* Add the record to the database. But only if it has not been
@ -405,7 +401,7 @@ cache_addgr (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__,

7
nscd/initgrcache.c
View File

@ -171,12 +171,10 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
nip = nip->next;
}
bool all_written;
ssize_t total;
ssize_t written;
time_t timeout;
out:
all_written = true;
timeout = MAX_TIMEOUT_VALUE;
if (!any_success)
{
@ -381,9 +379,6 @@ addinitgroupsX (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;
}
@ -410,7 +405,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
free (groups);
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__,

8
nscd/pwdcache.c
View File

@ -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__,

12
nscd/servicescache.c
View File

@ -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__,