From 384ca551743318bd9c9e24a496d6397f2e3f2a49 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 30 Oct 2007 00:48:09 +0000 Subject: * nscd/Makefile (nscd-modules): Replace gethstbynm2_r with gethstbynm3_r. * nscd/gethstbynm2_r.c: Remove. * nscd/gethstbynm3_r.c: New file. * nscd/aicache.c (addhstaiX): Use __gethostbyaddr2_r instead of __gethostbyaddr_r. * nscd/gethstbyad_r.c: Generate __gethostbyaddr2_r function. Define __gethostbyaddr_r compatibility wrapper. * nscd/hstcache.c (cache_addhst): Add ttl parameter. Use it when determining timeout of entry. (lookup): Take new parameter and pass it to __gethostbyname3_r and __gethostbyaddr2_r. (addhstbyX): Pass reference to variable for TTL to lookup and cache_addhst. * nss/Versions [glibc] (GLIBC_PRIVATE): Export __nss_passwd_lookup2, __nss_group_lookup2, __nss_hosts_lookup2, __nss_services_lookup2, and __nss_next2. Remove __nss_services_lookup. * nss/XXX-lookup.c: Name function now *_lookup2. Add new parameter. Add compat wrapper. * nss/getXXbyYY_r.c: Changes to call new *_lookup2 functions and __nss_next2. * nss/getXXent_r.c: Likewise. * nss/getnssent_r.c: Likewise. * nss/nsswitch.c (__nss_lookup): Add new parameter. If first function does not exist in module, try the optional second name. (__nss_next2): New function. (__nss_next): Now wrapper around __nss_next2. * nss/nsswitch.h: Adjust __nss_lookup prototype. Declare __nss_next2. Adjust definition of db_lookup_function type. * nss/service-lookup.c: Define NO_COMPAT. * include/netdb.h: Declare __gethostbyaddr2_r and __gethostbyname3_r. * inet/ether_hton.c: Use __nss_next2 instead of __nss_next. * inet/ether_ntoh.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/publickey.c: Likewise. * inet/getnetgrent.c: Likewise. Adjust calls to __nss_lookup. * inet/gethstbyad_r.c (DB_LOOKUP_FCT): Change to __nss_hosts_lookup2. * inet/gethstbynm2_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstbynm_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstent_r.c (DB_LOOKUP_FCT): Likewise. * nscd/aicache.c (addhstaiX): Fix default TTL handling. * inet/getnetgrent.c (setup): Encrypt static pointer. --- nscd/hstcache.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'nscd/hstcache.c') diff --git a/nscd/hstcache.c b/nscd/hstcache.c index 54222a3..c93691d 100644 --- a/nscd/hstcache.c +++ b/nscd/hstcache.c @@ -80,7 +80,8 @@ static const hst_response_header notfound = static void cache_addhst (struct database_dyn *db, int fd, request_header *req, const void *key, struct hostent *hst, uid_t owner, - struct hashentry *he, struct datahead *dh, int errval) + struct hashentry *he, struct datahead *dh, int errval, + int32_t ttl) { ssize_t total; ssize_t written; @@ -131,7 +132,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, dataset->head.usable = true; /* Compute the timeout time. */ - dataset->head.timeout = t + db->negtimeout; + dataset->head.timeout = t + (ttl == INT32_MAX + ? db->negtimeout : ttl); /* This is the reply. */ memcpy (&dataset->resp, ¬found, total); @@ -247,7 +249,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, dataset->head.usable = true; /* Compute the timeout time. */ - dataset->head.timeout = t + db->postimeout; + dataset->head.timeout = t + (ttl == INT32_MAX ? db->postimeout : ttl); dataset->resp.version = NSCD_VERSION; dataset->resp.found = 1; @@ -423,19 +425,19 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, static int lookup (int type, void *key, struct hostent *resultbufp, char *buffer, - size_t buflen, struct hostent **hst) + size_t buflen, struct hostent **hst, int32_t *ttlp) { if (type == GETHOSTBYNAME) - return __gethostbyname2_r (key, AF_INET, resultbufp, buffer, buflen, hst, - &h_errno); + return __gethostbyname3_r (key, AF_INET, resultbufp, buffer, buflen, hst, + &h_errno, ttlp, NULL); if (type == GETHOSTBYNAMEv6) - return __gethostbyname2_r (key, AF_INET6, resultbufp, buffer, buflen, hst, - &h_errno); + return __gethostbyname3_r (key, AF_INET6, resultbufp, buffer, buflen, hst, + &h_errno, ttlp, NULL); if (type == GETHOSTBYADDR) - return __gethostbyaddr_r (key, NS_INADDRSZ, AF_INET, resultbufp, buffer, - buflen, hst, &h_errno); - return __gethostbyaddr_r (key, NS_IN6ADDRSZ, AF_INET6, resultbufp, buffer, - buflen, hst, &h_errno); + return __gethostbyaddr2_r (key, NS_INADDRSZ, AF_INET, resultbufp, buffer, + buflen, hst, &h_errno, ttlp); + return __gethostbyaddr2_r (key, NS_IN6ADDRSZ, AF_INET6, resultbufp, buffer, + buflen, hst, &h_errno, ttlp); } @@ -453,6 +455,7 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req, struct hostent *hst; bool use_malloc = false; int errval = 0; + int32_t ttl = INT32_MAX; if (__builtin_expect (debug_level > 0, 0)) { @@ -470,7 +473,7 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req, dbg_log (_("Reloading \"%s\" in hosts cache!"), (char *) str); } - while (lookup (req->type, key, &resultbuf, buffer, buflen, &hst) != 0 + while (lookup (req->type, key, &resultbuf, buffer, buflen, &hst, &ttl) != 0 && h_errno == NETDB_INTERNAL && (errval = errno) == ERANGE) { @@ -504,7 +507,7 @@ addhstbyX (struct database_dyn *db, int fd, request_header *req, } cache_addhst (db, fd, req, key, hst, uid, he, dh, - h_errno == TRY_AGAIN ? errval : 0); + h_errno == TRY_AGAIN ? errval : 0, ttl); if (use_malloc) free (buffer); -- cgit v1.1