2007-01-15 Ulrich Drepper <drepper@redhat.com>
+ * nscd/connections.c (servinfo): Renamed to reqinfo. Change all
+ users.
+ (handle_request): Remove unnecessary tests.
+
* nscd/cache.c (cache_add): Record the failure to add to the cache.
2007-01-15 Jakub Jelinek <jakub@redhat.com>
{
bool data_request;
struct database_dyn *db;
-} const servinfo[LASTREQ] =
+} const reqinfo[LASTREQ] =
{
[GETPWBYNAME] = { true, &dbs[pwddb] },
[GETPWBYUID] = { true, &dbs[pwddb] },
/* Make sure the record is for this type of service. */
if (here->type >= LASTREQ
- || servinfo[here->type].db != &dbs[dbnr])
+ || reqinfo[here->type].db != &dbs[dbnr])
goto fail;
/* Validate boolean field value. */
return;
}
- /* Make the SELinux check before we go on to the standard checks. We
- need to verify that the request type is valid, since it has not
- yet been checked at this point. */
- if (selinux_enabled
- && __builtin_expect (req->type >= GETPWBYNAME, 1)
- && __builtin_expect (req->type < LASTREQ, 1)
- && nscd_request_avc_has_perm (fd, req->type) != 0)
+ /* Make the SELinux check before we go on to the standard checks. */
+ if (selinux_enabled && nscd_request_avc_has_perm (fd, req->type) != 0)
return;
- struct database_dyn *db = servinfo[req->type].db;
+ struct database_dyn *db = reqinfo[req->type].db;
/* See whether we can service the request from the cache. */
- if (__builtin_expect (servinfo[req->type].data_request, true))
+ if (__builtin_expect (reqinfo[req->type].data_request, true))
{
if (__builtin_expect (debug_level, 0) > 0)
{
case GETFDHST:
case GETFDSERV:
#ifdef SCM_RIGHTS
- send_ro_fd (servinfo[req->type].db, key, fd);
+ send_ro_fd (reqinfo[req->type].db, key, fd);
#endif
break;