else
{
/* Put a bad page at the bottom of the stack */
- guardaddr = (void *)new_thread_bottom - stacksize;
guardsize = attr->__guardsize;
+ guardaddr = (void *)new_thread_bottom - guardsize;
if (mmap ((caddr_t) guardaddr, guardsize, 0, MAP_FIXED, -1, 0)
== MAP_FAILED)
{
/* One fewer threads in __pthread_handles */
__pthread_handles_num--;
- /* Destroy read lock list, and list of free read lock structures.
+ /* Destroy read lock list, and list of free read lock structures.
If the former is not empty, it means the thread exited while
holding read locks! */
{ {0, 0}, 0, NULL, NULL, NULL, \
PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE }
#endif
+#ifdef __USE_GNU
+# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
+ { {0, 0}, 0, NULL, NULL, NULL, \
+ PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, PTHREAD_PROCESS_PRIVATE }
+#endif
/* Values for attributes. */
static struct database dbs[lastdb] =
{
[pwddb] = {
- lock: PTHREAD_RWLOCK_INITIALIZER,
+ lock: PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
enabled: 0,
check_file: 1,
filename: "/etc/passwd",
negtimeout: 20
},
[grpdb] = {
- lock: PTHREAD_RWLOCK_INITIALIZER,
+ lock: PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
enabled: 0,
check_file: 1,
filename: "/etc/group",
negtimeout: 60
},
[hstdb] = {
- lock: PTHREAD_RWLOCK_INITIALIZER,
+ lock: PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
enabled: 0,
check_file: 1,
filename: "/etc/hosts",
#endif
/* It should not be possible to crash the nscd with a silly
- request (i.e., a terribly large key. We limit the size
+ request (i.e., a terribly large key). We limit the size
to 1kb. */
if (req.key_len < 0 || req.key_len > 1024)
{
- dbg_log (_("key length in request too long: %Zd"), req.key_len);
+ dbg_log (_("key length in request too long: %zd"), req.key_len);
close (fd);
continue;
}
void
start_threads (void)
{
- long i;
+ long int i;
pthread_attr_t attr;
pthread_t th;
/* Cache handling for host lookup.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
#include <unistd.h>
#include <libintl.h>
#include <arpa/inet.h>
+#include <arpa/nameser.h>
#include "nscd.h"
#include "dbg_log.h"
-/* Get implementation for some internal functions. */
-#include "../resolv/mapv4v6addr.h"
-
/* This is the standard reply in case the service is disabled. */
static const hst_response_header disabled =
+ h_name_len
+ h_aliases_cnt * sizeof (size_t)
+ h_addr_list_cnt * (hst->h_length
- + (hst->h_length == INADDRSZ
- ? IN6ADDRSZ : 0)));
+ + (hst->h_length == NS_INADDRSZ
+ ? NS_IN6ADDRSZ : 0)));
data = (struct hostdata *) malloc (total + req->key_len);
if (data == NULL)
for (cnt = 0; cnt < h_addr_list_cnt; ++cnt)
cp = mempcpy (cp, hst->h_addr_list[cnt], hst->h_length);
- /* And the generated IPv6 addresses if necessary. */
- if (hst->h_length == INADDRSZ)
- {
- /* Generate the IPv6 addresses. */
- for (cnt = 0; cnt < h_addr_list_cnt; cp += IN6ADDRSZ, ++cnt)
- map_v4v6_address (hst->h_addr_list[cnt], cp);
- }
-
/* Then the aliases. */
aliases = cp;
for (cnt = 0; cnt < h_aliases_cnt; ++cnt)
unnecessarily let the receiver wait. */
written = write (fd, data, total);
- addr_list_type = (hst->h_length == INADDRSZ
+ addr_list_type = (hst->h_length == NS_INADDRSZ
? GETHOSTBYADDR : GETHOSTBYADDRv6);
/* Compute the timeout time. */
seteuid (uid);
}
- while (__gethostbyaddr_r (key, INADDRSZ, AF_INET, &resultbuf, buffer,
+ while (__gethostbyaddr_r (key, NS_INADDRSZ, AF_INET, &resultbuf, buffer,
buflen, &hst, &h_errno) != 0
&& h_errno == NETDB_INTERNAL
&& errno == ERANGE)
seteuid (uid);
}
- while (__gethostbyaddr_r (key, IN6ADDRSZ, AF_INET6, &resultbuf,
+ while (__gethostbyaddr_r (key, NS_IN6ADDRSZ, AF_INET6, &resultbuf,
buffer, buflen, &hst, &h_errno) != 0
&& h_errno == NETDB_INTERNAL
&& errno == ERANGE)