diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-01-30 20:34:21 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-01-30 20:34:21 +0000 |
| commit | 6925ef9a679d24f7a3bff1dd138604682da11c12 (patch) | |
| tree | 3928697a38d6a6a3ae424fb52d0675d88f3b2274 | |
| parent | 2af4049472d2f8f5113d5899a574e702e5a4e294 (diff) | |
| download | glibc-6925ef9a679d24f7a3bff1dd138604682da11c12.tar.gz glibc-6925ef9a679d24f7a3bff1dd138604682da11c12.tar.xz glibc-6925ef9a679d24f7a3bff1dd138604682da11c12.zip | |
Update.
2005-01-30 Ulrich Drepper <drepper@redhat.com> * nscd/nscd_helper.c (get_mapping): Use MSG_NOSIGNAL if available. * nscd/connections.c (send_ro_fd): Likewise.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nscd/connections.c | 7 | ||||
| -rw-r--r-- | nscd/nscd_helper.c | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index b222e12ea5..22be595d54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-30 Ulrich Drepper <drepper@redhat.com> + + * nscd/nscd_helper.c (get_mapping): Use MSG_NOSIGNAL if available. + * nscd/connections.c (send_ro_fd): Likewise. + 2005-01-28 H.J. Lu <hongjiu.lu@intel.com> * elf/tst-auditmod1.c: Add ia64 entries. diff --git a/nscd/connections.c b/nscd/connections.c index f22d72e265..63a01e3bb6 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -1,5 +1,5 @@ /* Inner loops of cache daemon. - Copyright (C) 1998-2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1998-2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -603,7 +603,10 @@ send_ro_fd (struct database_dyn *db, char *key, int fd) /* Send the control message. We repeat when we are interrupted but everything else is ignored. */ - (void) TEMP_FAILURE_RETRY (sendmsg (fd, &msg, 0)); +#ifndef MSG_NOSIGNAL +# define MSG_NOSIGNAL 0 +#endif + (void) TEMP_FAILURE_RETRY (sendmsg (fd, &msg, MSG_NOSIGNAL)); if (__builtin_expect (debug_level > 0, 0)) dbg_log (_("provide access to FD %d, for %s"), db->ro_fd, key); diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c index 0e16cb8aeb..ea4fb968db 100644 --- a/nscd/nscd_helper.c +++ b/nscd/nscd_helper.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1998-2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -138,7 +138,10 @@ get_mapping (request_type type, const char *key, /* Failure or timeout. */ goto out_close2; - if (TEMP_FAILURE_RETRY (__recvmsg (sock, &msg, 0)) != keylen) +#ifndef MSG_NOSIGNAL +# define MSG_NOSIGNAL 0 +#endif + if (TEMP_FAILURE_RETRY (__recvmsg (sock, &msg, MSG_NOSIGNAL)) != keylen) goto out_close2; mapfd = *(int *) CMSG_DATA (cmsg); |