aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nscd/connections.c55
2 files changed, 34 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index a96467a..526c988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-01-15 Ulrich Drepper <drepper@redhat.com>
+ * nscd/connections.c (serv2db): Change type into structure which
+ also says whether this is a request for data. Renamed to
+ servinfo. All users changed.
+ (handle_request): Much simpler test whether we should search the cache.
+
* nscd/connections.c (handle_request): Fix thinko in selinux test
invocation.
diff --git a/nscd/connections.c b/nscd/connections.c
index 97287bc..179b0a3 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -181,24 +181,31 @@ struct database_dyn dbs[lastdb] =
/* Mapping of request type to database. */
-static struct database_dyn *const serv2db[LASTREQ] =
+static struct
{
- [GETPWBYNAME] = &dbs[pwddb],
- [GETPWBYUID] = &dbs[pwddb],
- [GETGRBYNAME] = &dbs[grpdb],
- [GETGRBYGID] = &dbs[grpdb],
- [GETHOSTBYNAME] = &dbs[hstdb],
- [GETHOSTBYNAMEv6] = &dbs[hstdb],
- [GETHOSTBYADDR] = &dbs[hstdb],
- [GETHOSTBYADDRv6] = &dbs[hstdb],
- [GETFDPW] = &dbs[pwddb],
- [GETFDGR] = &dbs[grpdb],
- [GETFDHST] = &dbs[hstdb],
- [GETAI] = &dbs[hstdb],
- [INITGROUPS] = &dbs[grpdb],
- [GETSERVBYNAME] = &dbs[servdb],
- [GETSERVBYPORT] = &dbs[servdb],
- [GETFDSERV] = &dbs[servdb]
+ bool data_request;
+ struct database_dyn *db;
+} const servinfo[LASTREQ] =
+{
+ [GETPWBYNAME] = { true, &dbs[pwddb] },
+ [GETPWBYUID] = { true, &dbs[pwddb] },
+ [GETGRBYNAME] = { true, &dbs[grpdb] },
+ [GETGRBYGID] = { true, &dbs[grpdb] },
+ [GETHOSTBYNAME] = { true, &dbs[hstdb] },
+ [GETHOSTBYNAMEv6] = { true, &dbs[hstdb] },
+ [GETHOSTBYADDR] = { true, &dbs[hstdb] },
+ [GETHOSTBYADDRv6] = { true, &dbs[hstdb] },
+ [SHUTDOWN] = { false, NULL },
+ [GETSTAT] = { false, NULL },
+ [SHUTDOWN] = { false, NULL },
+ [GETFDPW] = { false, &dbs[pwddb] },
+ [GETFDGR] = { false, &dbs[grpdb] },
+ [GETFDHST] = { false, &dbs[hstdb] },
+ [GETAI] = { true, &dbs[hstdb] },
+ [INITGROUPS] = { true, &dbs[grpdb] },
+ [GETSERVBYNAME] = { true, &dbs[servdb] },
+ [GETSERVBYPORT] = { true, &dbs[servdb] },
+ [GETFDSERV] = { false, &dbs[servdb] }
};
@@ -385,7 +392,7 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
/* Make sure the record is for this type of service. */
if (here->type >= LASTREQ
- || serv2db[here->type] != &dbs[dbnr])
+ || servinfo[here->type].db != &dbs[dbnr])
goto fail;
/* Validate boolean field value. */
@@ -942,14 +949,10 @@ cannot handle old request version %d; current version is %d"),
&& nscd_request_avc_has_perm (fd, req->type) != 0)
return;
- struct database_dyn *db = serv2db[req->type];
+ struct database_dyn *db = servinfo[req->type].db;
- // XXX Clean up so that each new command need not introduce a
- // XXX new conditional.
- if ((__builtin_expect (req->type, GETPWBYNAME) >= GETPWBYNAME
- && __builtin_expect (req->type, GETHOSTBYADDRv6) <= GETHOSTBYADDRv6)
- || req->type == GETAI || req->type == INITGROUPS
- || req->type == GETSERVBYNAME || req->type == GETSERVBYPORT)
+ /* See whether we can service the request from the cache. */
+ if (__builtin_expect (servinfo[req->type].data_request, true))
{
if (__builtin_expect (debug_level, 0) > 0)
{
@@ -1148,7 +1151,7 @@ cannot handle old request version %d; current version is %d"),
case GETFDHST:
case GETFDSERV:
#ifdef SCM_RIGHTS
- send_ro_fd (serv2db[req->type], key, fd);
+ send_ro_fd (servinfo[req->type].db, key, fd);
#endif
break;