diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-08-25 18:55:07 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-08-25 18:55:07 +0000 |
| commit | dd3394742b3e2e01f403b1c1b41ed39273b2212e (patch) | |
| tree | 5fed86738b0d518989679f3194f896fc9fcebbe2 /resolv | |
| parent | 9b0cdd693e7f54fd35fd58931b940efe6ccb88cd (diff) | |
Updated to fedora-glibc-20070825T1839
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/arpa/nameser.h | 5 | ||||
| -rw-r--r-- | resolv/res_hconf.c | 4 | ||||
| -rw-r--r-- | resolv/res_send.c | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index f6330a8979..a164221df4 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -424,6 +424,11 @@ typedef enum __ns_cert_types { #define NS_NXT_MAX 127 /* + * EDNS0 extended flags, host order. + */ +#define NS_OPT_DNSSEC_OK 0x8000U + +/* * Inline versions of get/put short/long. Pointer is advanced. */ #define NS_GET16(s, cp) do { \ diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index f45888933f..c53b809ef7 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). @@ -361,6 +361,7 @@ _res_hconf_init (void) } +#ifndef NOT_IN_libc /* List of known interfaces. */ libc_freeres_ptr ( static struct netaddr @@ -532,3 +533,4 @@ _res_hconf_trim_domains (struct hostent *hp) for (i = 0; hp->h_aliases[i]; ++i) _res_hconf_trim_domain (hp->h_aliases[i]); } +#endif diff --git a/resolv/res_send.c b/resolv/res_send.c index 27dd1d4351..23306a2fb4 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -425,9 +425,12 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, EXT(statp).nsaddrs[n] = malloc(sizeof (struct sockaddr_in6)); if (EXT(statp).nsaddrs[n] != NULL) { - memcpy(EXT(statp).nsaddrs[n], - &statp->nsaddr_list[ns], - sizeof (struct sockaddr_in)); + memset (mempcpy(EXT(statp).nsaddrs[n], + &statp->nsaddr_list[ns], + sizeof (struct sockaddr_in)), + '\0', + sizeof (struct sockaddr_in6) + - sizeof (struct sockaddr_in)); EXT(statp).nssocks[n] = -1; n++; } |