summary refs log tree commit diff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-04 10:39:13 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-04 10:39:13 +0000
commitba9234d947af45f15b1e4dece1a9cd447cecc038 (patch)
treefb6ec34cfaf4d1cef1a689164024fc99f2649206 /nscd
parent6ef9f70bdbe3fdb7b16d7c9726e624700d774136 (diff)
downloadglibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.tar.gz
glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.tar.xz
glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.zip
Update.
1998-07-04 10:14  Ulrich Drepper  <drepper@cygnus.com>

	* libio/Makefile (routines): Add iofread_u and iofwrite_u.
	* libio/Versions: Add fread_unlocked and fwrite_unlocked.

	* Makerules (lib%.so): Adjust ignore pattern for last makefile change.

	* time/tzfile.c (decode): Optimize by using bswap_32.
	(__tzfile_read): Use _unlocked stream functions.  Correct setting of
	__tzname array values.
	(__tzfile_compute): Correct setting of __tzname array values.
	* time/tzset.c (__tzstring): Clean up a bit.

1998-06-29 19:01  Jim Wilson  <wilson@cygnus.com>

	* posix/regex.c (re_comp): Add cast to char * before gettext calls.

1998-06-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/bsd/poll.c (__poll): Allocate fd_set dynamically so
	that fd can be bigger than FD_SETSIZE.

1998-07-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nscd/grpcache.c: Include <unistd.h>.
	* nscd/pwdcache.c: Likewise.

	* nis/nis_modify.c: Include <string.h>.
	* nis/nis_add.c: Likewise.
	* nis/nis_checkpoint.c: Likewise.
	* posix/runptests.c: Likewise.
	* sysdeps/generic/statvfs64.c: Likewise.
	* sysdeps/generic/fstatvfs64.c: Likewise.

1998-07-03 13:16  Ulrich Drepper  <drepper@cygnus.com>

	* localedata/charmaps/ISO-8859-9: Change mapping for 0xea, 0xec, 0xef
	to match data from Unicode.
	Reported by Michael Deutschmann <michael@talamasca.wkpowerlink.com>.

1998-07-03 11:45  Ulrich Drepper  <drepper@cygnus.com>

	* stdio-common/printf.h: Define printf_function and
	printf_arginfo_function types using __PMT not __P.
	Reported by Marc Lehmann.

1998-07-02 14:07 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* assert/test-assert.c: New test.
	* assert/test-assert-perr.c: New test.
	* assert/Makefile (tests): Add test-assert and test-assert-perr.

1998-07-02 13:45  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	BSD-style SCM_CREDS support.

	* sysdeps/unix/sysv/linux/socket.h: Define struct cmsgcred and
	SCM_CREDS.
	* sysdeps/unix/sysv/linux/sendmsg.c: New file.  Convert user
	visible SCM_CREDS packet to what the kernel wants.
	* sysdeps/unix/sysv/linux/recvmsg.c: New file.  Convert
	SCM_CREDS packet output by kernel to what users want.

	* sysdeps/unix/sysv/linux/sendmsg.S: Moved to...
	* sysdeps/unix/sysv/linux/__sendmsg.S: here.
	* sysdeps/unix/sysv/linux/recvmsg.S: Moved to...
	* sysdeps/unix/sysv/linux/__recvmsg.S: here.

	* sysdeps/unix/sysv/linux/Makefile [subdir=socket]: Add
	__sendmsg and __recvmsg to sysdep_routines.
	* sysdeps/unix/sysv/linux/Dist: Add __sendmsg.S and __recvmsg.S.

1998-07-02  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nscd/grpcache.c: Fix gid pointer handling and debug messages.
	* nscd/pwdcache.c: Fix uid pointer handling and debug messages.
	* nscd/nscd.c: Check, if pthread_create fails.

1998-07-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* stdio-common/test_rdwr.c (main): Use %Zu for size_t in printf
	format strings.
	* stdio-common/bug1.c (main): Likewise.
	* stdio-common/bug5.c (main): Likewise.
	* stdio-common/tstgetln.c (main): Likewise.
	* elf/sprof.c (generate_call_graph): Likewise.
	(load_shobj): Likewise.
	* posix/runptests.c (main): Likewise.
	* string/tst-strlen.c (main): Likewise.

	* sysdeps/libm-ieee754/e_acos.c (__ieee754_acos): Remove unused
	variable q3.
	* sysdeps/libm-ieee754/e_asin.c (__ieee754_asin): Likewise

1998-07-03  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* wctype/Versions: Add __towctrans.
	Noticed by Alex Buell <alex.buell@tahallah.demon.co.uk>.

1998-07-02  Mark Kettenis  <kettenis@phys.uva.nl>

	* grp/initgroups.c (compat_call): Only call dynamically loaded
	functions if they are really present.

1998-07-02  Mark Kettenis  <kettenis@phys.uva.nl>

	* sysdeps/unix/sysv/linux/bits/sched.h: Move __END_DECLS within
	#ifdef that contains __BEGIN_DECLS.

1998-07-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* libio/iofwrite.c: Fix return value when size == 0.

1998-07-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* posix/Makefile (distribute): Add annexc.c.
	(generated): Add $(objpfx)annexc and $(objpfx)annexc.out.

1998-07-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
	bits/pthreadtypes.h here, and do not clobber headers.

	* sysdeps/unix/sysv/linux/Dist: Add bits/pthreadtypes.h.

1998-07-03  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* timezone/tst-timezone.c: Add tests for tzname variable.

1998-07-03 12:17  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* Makefile [versioning=yes]: Build the mapfiles with a pattern
	rule that lists all of them as targets.
	(sysd-versions): Depend only on Versions.def.  Write a Makefile
	fragment that defines $(vers-libs) based on contents of that file;
	then include it.
	(lib-noranlib): Depend on lib-mapfiles not sysd-versions.
	(lib-mapfiles): New target, depends on sysd-versions and $(vers-libs).
	Predicate all this on avoid-generated unset as well as versioning.

1998-07-03 14:35  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
Diffstat (limited to 'nscd')
-rw-r--r--nscd/grpcache.c34
-rw-r--r--nscd/nscd.c61
-rw-r--r--nscd/pwdcache.c35
3 files changed, 95 insertions, 35 deletions
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 3f3f4ba0ec..2806ddd52e 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -22,6 +22,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <rpcsvc/nis.h>
 #include <sys/types.h>
 
@@ -48,7 +49,7 @@ typedef struct grphash grphash;
 struct gidhash
 {
   struct gidhash *next;
-  struct grphash *grptr;
+  struct group *grptr;
 };
 typedef struct gidhash gidhash;
 
@@ -176,6 +177,7 @@ static int
 add_cache (struct group *grp)
 {
   grphash *work;
+  gidhash *gidwork;
   unsigned long int hash = __nis_hash (grp->gr_name,
 				       strlen (grp->gr_name)) % modulo;
 
@@ -197,7 +199,17 @@ add_cache (struct group *grp)
     }
 
   time (&work->create);
-  gidtbl[grp->gr_gid % modulo].grptr = work;
+  gidwork = &gidtbl[grp->gr_gid % modulo];
+  if (gidwork->grptr == NULL)
+    gidwork->grptr = work->grp;
+  else
+    {
+      while (gidwork->next != NULL)
+	gidwork = gidwork->next;
+
+      gidwork->next = calloc (1, sizeof (gidhash));
+      gidwork->next->grptr = work->grp;
+    }
 
   return 0;
 }
@@ -231,8 +243,8 @@ cache_search_gid (gid_t gid)
 
   while (work->grptr != NULL)
     {
-      if (work->grptr->grp->gr_gid == gid)
-	return work->grptr->grp;
+      if (work->grptr->gr_gid == gid)
+	return work->grptr;
       if (work->next != NULL)
 	work = work->next;
       else
@@ -475,7 +487,7 @@ cache_getgrgid (void *v_param)
   return NULL;
 }
 
-void *
+static void *
 grptable_update (void *v)
 {
   time_t now;
@@ -509,7 +521,7 @@ grptable_update (void *v)
 
 		  while (uh && uh->grptr)
 		    {
-		      if (uh->grptr->grp->gr_gid == work->grp->gr_gid)
+		      if (uh->grptr->gr_gid == work->grp->gr_gid)
 			{
 			  if (debug_flag > 3)
 			    dbg_log (_("Give gid for \"%s\" free"),
@@ -543,14 +555,14 @@ grptable_update (void *v)
 	    }
 	}
       if (debug_flag > 2)
-	dbg_log (_("(pwdtable_update) Release wait lock\n"));
+	dbg_log (_("(grptable_update) Release wait lock"));
       pthread_rwlock_unlock (&grplock);
       sleep (20);
     }
   return NULL;
 }
 
-void *
+static void *
 negtable_update (void *v)
 {
   time_t now;
@@ -561,12 +573,12 @@ negtable_update (void *v)
   while (!do_shutdown)
     {
       if (debug_flag > 2)
-	dbg_log (_("(negtable_update) Wait for write lock!"));
+	dbg_log (_("(neggrptable_update) Wait for write lock!"));
 
       pthread_rwlock_wrlock (&neglock);
 
       if (debug_flag > 2)
-	dbg_log (_("(negtable_update) Have write lock"));
+	dbg_log (_("(neggrptable_update) Have write lock"));
 
       time (&now);
       for (i = 0; i < modulo; ++i)
@@ -597,7 +609,7 @@ negtable_update (void *v)
 	    }
 	}
       if (debug_flag > 2)
-	dbg_log (_("(negtable_update) Release wait lock"));
+	dbg_log (_("(neggrptable_update) Release wait lock"));
       pthread_rwlock_unlock (&neglock);
       sleep (10);
     }
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 9f167d2daa..e1c636775f 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -309,7 +309,7 @@ write_pid (const char *file)
 typedef int (*pwbyname_function) (const char *name, struct passwd *pw,
 				   char *buffer, size_t buflen);
 
-/* Hanlde incoming requests.  */
+/* Handle incoming requests.  */
 static
 void handle_requests (void)
 {
@@ -317,6 +317,12 @@ void handle_requests (void)
   int conn; /* Handle on which connection (client) the request came from.  */
   int done = 0;
   char *key;
+  pthread_attr_t th_attr;
+
+  /* We will create all threads detached.  Therefore prepare an attribute
+     now.  */
+  pthread_attr_init (&th_attr);
+  pthread_attr_setdetachstate (&th_attr, PTHREAD_CREATE_DETACHED);
 
   while (!done)
     {
@@ -331,15 +337,23 @@ void handle_requests (void)
 	  {
 	    param_t *param = malloc (sizeof (param_t));
 	    pthread_t thread;
+	    int status;
 
 	    if (debug_flag)
 	      dbg_log ("\tGETPWBYNAME (%s)", key);
 	    param->key = key;
 	    param->conn = conn;
 	    if (disabled_passwd)
-	      pthread_create (&thread, NULL, cache_pw_disabled, (void *)param);
+	      status = pthread_create (&thread, &th_attr, cache_pw_disabled,
+				       (void *)param);
 	    else
-	      pthread_create (&thread, NULL, cache_getpwnam, (void *)param);
+	      status = pthread_create (&thread, &th_attr, cache_getpwnam,
+				       (void *)param);
+	    if (status != 0)
+	      {
+		dbg_log (_("Creation of thread failed: %s"), strerror (errno));
+		close_socket (conn);
+	      }
 	    pthread_detach (thread);
 	  }
 	  break;
@@ -347,48 +361,69 @@ void handle_requests (void)
 	  {
 	    param_t *param = malloc (sizeof (param_t));
 	    pthread_t thread;
+	    int status;
 
 	    if (debug_flag)
 	      dbg_log ("\tGETPWBYUID (%s)", key);
 	    param->key = key;
 	    param->conn = conn;
 	    if (disabled_passwd)
-	      pthread_create (&thread, NULL, cache_pw_disabled, (void *)param);
+	      status = pthread_create (&thread, &th_attr, cache_pw_disabled,
+			      (void *)param);
 	    else
-	      pthread_create (&thread, NULL, cache_getpwuid, (void *)param);
-	    pthread_detach (thread);
+	      status = pthread_create (&thread, &th_attr, cache_getpwuid,
+				       (void *)param);
+	    if (status != 0)
+	      {
+		dbg_log (_("Creation of thread failed: %s"), strerror (errno));
+		close_socket (conn);
+	      }
 	  }
 	  break;
 	case GETGRBYNAME:
 	  {
 	    param_t *param = malloc (sizeof (param_t));
 	    pthread_t thread;
+	    int status;
 
 	    if (debug_flag)
 	      dbg_log ("\tGETGRBYNAME (%s)", key);
 	    param->key = key;
 	    param->conn = conn;
 	    if (disabled_group)
-	      pthread_create (&thread, NULL, cache_gr_disabled, (void *)param);
+	      status = pthread_create (&thread, &th_attr, cache_gr_disabled,
+				       (void *)param);
 	    else
-	      pthread_create (&thread, NULL, cache_getgrnam, (void *)param);
-	    pthread_detach (thread);
+	      status = pthread_create (&thread, &th_attr, cache_getgrnam,
+				       (void *)param);
+	    if (status != 0)
+	      {
+		dbg_log (_("Creation of thread failed: %s"), strerror (errno));
+		close_socket (conn);
+	      }
 	  }
 	  break;
 	case GETGRBYGID:
 	  {
 	    param_t *param = malloc (sizeof (param_t));
 	    pthread_t thread;
+	    int status;
 
 	    if (debug_flag)
 	      dbg_log ("\tGETGRBYGID (%s)", key);
 	    param->key = key;
 	    param->conn = conn;
 	    if (disabled_group)
-	      pthread_create (&thread, NULL, cache_gr_disabled, (void *)param);
+	      status = pthread_create (&thread, &th_attr, cache_gr_disabled,
+				       (void *)param);
 	    else
-	      pthread_create (&thread, NULL, cache_getgrgid, (void *)param);
-	    pthread_detach (thread);
+	      status = pthread_create (&thread, &th_attr, cache_getgrgid,
+				       (void *)param);
+	    if (status != 0)
+	      {
+		dbg_log (_("Creation of thread failed: %s"), strerror (errno));
+		close_socket (conn);
+	      }
 	  }
 	  break;
 	case GETHOSTBYNAME:
@@ -432,4 +467,6 @@ void handle_requests (void)
 	  break;
 	}
     }
+
+  pthread_attr_destroy (&th_attr);
 }
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 721e77b7c9..e2bf73afc1 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -22,6 +22,7 @@
 #include <pthread.h>
 #include <pwd.h>
 #include <string.h>
+#include <unistd.h>
 #include <rpcsvc/nis.h>
 #include <sys/types.h>
 
@@ -48,7 +49,7 @@ typedef struct pwdhash pwdhash;
 struct uidhash
 {
   struct uidhash *next;
-  struct pwdhash *pwptr;
+  struct passwd *pwptr;
 };
 typedef struct uidhash uidhash;
 
@@ -159,6 +160,7 @@ static int
 add_cache (struct passwd *pwd)
 {
   pwdhash *work;
+  uidhash *uidwork;
   unsigned long int hash = __nis_hash (pwd->pw_name,
 				       strlen (pwd->pw_name)) % modulo;
 
@@ -180,8 +182,17 @@ add_cache (struct passwd *pwd)
     }
   /* Set a pointer from the pwuid hash table to the pwname hash table */
   time (&work->create);
-  uidtbl[pwd->pw_uid % modulo].pwptr = work;
+  uidwork = &uidtbl[pwd->pw_uid % modulo];
+  if (uidwork->pwptr == NULL)
+    uidwork->pwptr = work->pwd;
+  else
+   {
+      while (uidwork->next != NULL)
+	uidwork = uidwork->next;
 
+      uidwork->next = calloc (1, sizeof (uidhash));
+      uidwork->next->pwptr = work->pwd;
+    }
   return 0;
 }
 
@@ -214,8 +225,8 @@ cache_search_uid (uid_t uid)
 
   while (work->pwptr != NULL)
     {
-      if (work->pwptr->pwd->pw_uid == uid)
-	return work->pwptr->pwd;
+      if (work->pwptr->pw_uid == uid)
+	return work->pwptr;
       if (work->next != NULL)
 	work = work->next;
       else
@@ -458,7 +469,7 @@ cache_getpwuid (void *v_param)
   return NULL;
 }
 
-void *
+static void *
 pwdtable_update (void *v)
 {
   time_t now;
@@ -492,7 +503,7 @@ pwdtable_update (void *v)
 
 		  while (uh != NULL && uh->pwptr)
 		    {
-		      if (uh->pwptr->pwd->pw_uid == work->pwd->pw_uid)
+		      if (uh->pwptr->pw_uid == work->pwd->pw_uid)
 			{
 			  if (debug_flag)
 			    dbg_log (_("Give uid for \"%s\" free"),
@@ -533,7 +544,7 @@ pwdtable_update (void *v)
   return NULL;
 }
 
-void *
+static void *
 negtable_update (void *v)
 {
   time_t now;
@@ -544,12 +555,12 @@ negtable_update (void *v)
   while (!do_shutdown)
     {
       if (debug_flag > 2)
-	dbg_log (_("(negtable_update) Wait for write lock!"));
+	dbg_log (_("(negpwdtable_update) Wait for write lock!"));
 
       pthread_rwlock_wrlock (&neglock);
 
-      if (debug_flag)
-	dbg_log (_("(negtable_update) Have write lock"));
+      if (debug_flag > 2)
+	dbg_log (_("(negpwdtable_update) Have write lock"));
 
       time (&now);
       for (i = 0; i < modulo; ++i)
@@ -579,8 +590,8 @@ negtable_update (void *v)
 	      work = work->next;
 	    }
 	}
-      if (debug_flag)
-	dbg_log (_("(negtable_update) Release wait lock"));
+      if (debug_flag > 2)
+	dbg_log (_("(negpwdtable_update) Release wait lock"));
 
       pthread_rwlock_unlock (&neglock);
       sleep (10);