Update.

1998-10-18  Ulrich Drepper  <drepper@cygnus.com>

	* resolv/nss_dns/dns-host.c: Add missing errnop parameter to the
	NSS functions.
	* resolv/nss_dns/dns-network.c: Likewise.

	* grp/Makefile: Don't search for linuxhtreads in add-ons, use
	have-thread-library to determine whether threads are available.
	* pwd/Makefile: Remove wrong comment.

	* inet/Makefile: Define CFLAGS-gethstbyad_r.c, CFLAGS-gethstbynm_r.c,
	and CFLAGS-gethstbynm2_r.c to -DUSE_NSCD=1.

	* locale/C-messages.c: Define default strings for YESTR and NOSTR.

	* nss/Versions: Add __nss_hosts_lookup.

	* nss/getXXbyYY.c: Remove unneeded assignment.

	* nss/getXXbyYY_r.c: Include nscd/nscd_proto.h only if needed.

	Almost complete rewrite of the NSCD to make it smaller, faster,
	add more functionnality and make it easier to extend.
	* nscd/Makfile (routines): Add nscd_gethst_r.
	(nscd-modules): Add hstcache, gethstbyad_r, gethstbynm2_r, and cache.
	* nscd/cache.c: New file.
	* nscd/gethstbyad_r.c: New file.
	* nscd/gethstbynm2_r.c: New file.
	* nscd/hstcache.c: New file.
	* nscd/nscd_gethst_r.c: New file.
	* nscd/connections.c: Rewritten.  Don't start new thread for every
	new connection.  Use a fixed set of threads which handle all
	connections and also the cache cleanup.
	* nscd/grpcache.c: Rewritten to use generic cache handling functions
	in cache.c.
	* nscd/nscd.c: Recognize new parameter nthreads.  Adjust initialization
	for rewrite.  Remove handle_requests function.
	* nscd/nscd.h (NSCD_VERSION): Bump to 2.
	Define new data structure for the new unified cache and the host
	database entries.
	* nscd/nscd_conf.c: Rewrite parsing partly to allow adding of more
	databases easily.  Recognize check-files and threads definitions.
	* nscd/nscd.conf: Add definition of enable-cache and check-files to
	passwd and group definitions.  Add new set of definitions for hosts.
	* nscd/nscd_getgr_r.c: Rewrite for new protocol.
	* nscd/nscd_getpw_r.c: Likewise.
	* nscd/nscd_proto.h: Add prototype for host database functions.
	* nscd/nscd_stat.c: Rewrite to simplify printing of information
	for many databases.
	* nscd/dbg_log.c: Remove unnecessary variable initializations.
	Global variable debug_flag is renamed to dbg_level.
	* nscd/dbg_log.h: Declare set_logfile.

1 files changed, 66 insertions, 28 deletions

diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c
index 917fe02..6ac1677 100644
--- a/nscd/nscd_conf.c
+++ b/nscd/nscd_conf.c
@@ -22,17 +22,27 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/param.h>
 #include <sys/types.h>
 
 #include "dbg_log.h"
 #include "nscd.h"
 
+/* Names of the databases.  */
+const char *dbnames[lastdb] =
+{
+  [pwddb] = "passwd",
+  [grpdb] = "group",
+  [hstdb] = "hosts"
+};
+
 int
-nscd_parse_file (const char *fname)
+nscd_parse_file (const char *fname, struct database dbs[lastdb])
 {
   FILE *fp;
   char *line, *cp, *entry, *arg1, *arg2;
   size_t len;
+  int cnt;
 
   /* Open the configuration file.  */
   fp = fopen (fname, "r");
@@ -92,41 +102,64 @@ nscd_parse_file (const char *fname)
 
       if (strcmp (entry, "positive-time-to-live") == 0)
 	{
-	  if (strcmp (arg1, "passwd") == 0)
-	    set_pos_pwd_ttl (atol (arg2));
-	  else if (strcmp (arg1, "group") == 0)
-	    set_pos_grp_ttl (atol (arg2));
-	  else
+	  for (cnt = 0; cnt < lastdb; ++cnt)
+	    if (strcmp (arg1, dbnames[cnt]) == 0)
+	      {
+		dbs[cnt].postimeout = atol (arg2);
+		break;
+	      }
+	  if (cnt == lastdb)
 	    dbg_log ("server %s is not supported\n", arg1);
 	}
       else if (strcmp (entry, "negative-time-to-live") == 0)
 	{
-	  if (strcmp (arg1, "passwd") == 0)
-	    set_neg_pwd_ttl (atol (arg2));
-	  else if (strcmp (arg1, "group") == 0)
-	    set_neg_grp_ttl (atol (arg2));
-	  else
-	    dbg_log (_("service %s is not supported"), arg1);
+	  for (cnt = 0; cnt < lastdb; ++cnt)
+	    if (strcmp (arg1, dbnames[cnt]) == 0)
+	      {
+		dbs[cnt].negtimeout = atol (arg2);
+		break;
+	      }
+	  if (cnt == lastdb)
+	    dbg_log ("server %s is not supported\n", arg1);
 	}
       else if (strcmp (entry, "suggested-size") == 0)
 	{
-	  if (strcmp (arg1, "passwd") == 0)
-	    set_pwd_modulo (atol (arg2));
-	  else if (strcmp (arg1, "group") == 0)
-	    set_grp_modulo (atol (arg2));
-	  else
-	    dbg_log (_("service %s is not supported"), arg1);
+	  for (cnt = 0; cnt < lastdb; ++cnt)
+	    if (strcmp (arg1, dbnames[cnt]) == 0)
+	      {
+		dbs[cnt].module = atol (arg2);
+		break;
+	      }
+	  if (cnt == lastdb)
+	    dbg_log ("server %s is not supported\n", arg1);
+	}
+      else if (strcmp (entry, "enable-cache") == 0)
+	{
+	  for (cnt = 0; cnt < lastdb; ++cnt)
+	    if (strcmp (arg1, dbnames[cnt]) == 0)
+	      {
+		if (strcmp (arg2, "no") == 0)
+		  dbs[cnt].enabled = 0;
+		else if (strcmp (arg2, "yes") == 0)
+		  dbs[cnt].enabled = 1;
+		break;
+	      }
+	  if (cnt == lastdb)
+	    dbg_log ("server %s is not supported\n", arg1);
 	}
-      else if (strcmp (entry, "enable-cache") ==0)
+      else if (strcmp (entry, "check-files") == 0)
 	{
-	  if (strcmp (arg1, "passwd") == 0
-	      && strcmp (arg2, "no") == 0)
-	    disabled_passwd = 1;
-	  else if (strcmp (arg1, "group") == 0
-		   && strcmp (arg2, "no") == 0)
-	    disabled_group = 1;
-	  else
-	    dbg_log (_("service %s is not supported"), arg1);
+	  for (cnt = 0; cnt < lastdb; ++cnt)
+	    if (strcmp (arg1, dbnames[cnt]) == 0)
+	      {
+		if (strcmp (arg2, "no") == 0)
+		  dbs[cnt].check_file = 0;
+		else if (strcmp (arg2, "yes") == 0)
+		  dbs[cnt].check_file = 1;
+		break;
+	      }
+	  if (cnt == lastdb)
+	    dbg_log ("server %s is not supported\n", arg1);
 	}
       else if (strcmp (entry, "logfile") == 0)
 	{
@@ -137,7 +170,12 @@ nscd_parse_file (const char *fname)
 	{
 	  int level = atoi (arg1);
 	  if (level > 0)
-	    debug_flag = level;
+	    debug_level = level;
+	}
+      else if (strcmp (entry, "threads") == 0)
+	{
+	  if (nthreads == -1)
+	    nthreads = MAX (atol (arg1), lastdb);
 	}
       else
 	dbg_log (_("Unknown option: %s %s %s"), entry, arg1, arg2);