From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Aug 2004 23:24:09 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~196
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a57532064137c37543e7e8861a8931444a21157c;p=thirdparty%2Fglibc.git

Update.

	* inet/getnetgrent_r.c (innetgr): We must get the lock used for
	the set/get/end interfaces since we call all these functions in
	succession and must not be interrupted doing this.
	Reported by Chuck Simmons.
---

diff --git a/ChangeLog b/ChangeLog
index c481a3f8370..828a4765e0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-08-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* inet/getnetgrent_r.c (innetgr): We must get the lock used for
+	the set/get/end interfaces since we call all these functions in
+	succession and must not be interrupted doing this.
+	Reported by Chuck Simmons.
+
 	* inet/netgroup.h (struct name_list): Replace name pointer with
 	zero-sized array.
 	* inet/getnetgrent_r.c: Adjust code for change in name_list
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index fa355b210e8..87853981cdb 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -344,6 +344,8 @@ innetgr (const char *netgroup, const char *host, const char *user,
   const char *current_group = netgroup;
   int real_entry = 0;
 
+  __libc_lock_lock (lock);
+
   /* Walk through the services until we found an answer or we shall
      not work further.  We can do some optimization here.  Since all
      services must provide the `setnetgrent' function we can do all
@@ -445,6 +447,8 @@ innetgr (const char *netgroup, const char *host, const char *user,
       break;
     }
 
+  __libc_lock_unlock (lock);
+
   /* Free the memory.  */
   while (known != NULL)
     {