diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:21:10 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:21:10 +0200 |
commit | d9e11d0c51182483d30760f3c66000a0e9b8c922 (patch) | |
tree | e1d147b2d9d270f8cec60e499bc5fd738144d4c2 /resolv | |
parent | d5ce2d1c5dfae01688cad679b2fbd071e70a1f3a (diff) | |
parent | 9a079e270a9bec7e1fe28aeda63e07c1bb808d44 (diff) |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
sysdeps/mach/hurd/i386/init-first.c
Diffstat (limited to 'resolv')
-rw-r--r-- | resolv/nss_dns/dns-canon.c | 1 | ||||
-rw-r--r-- | resolv/nss_dns/dns-network.c | 1 | ||||
-rw-r--r-- | resolv/res_debug.c | 12 | ||||
-rw-r--r-- | resolv/res_init.c | 1 | ||||
-rw-r--r-- | resolv/res_mkquery.c | 1 | ||||
-rw-r--r-- | resolv/resolv.h | 2 | ||||
-rw-r--r-- | resolv/tst-aton.c | 1 |
7 files changed, 15 insertions, 4 deletions
diff --git a/resolv/nss_dns/dns-canon.c b/resolv/nss_dns/dns-canon.c index 090ed7dda2..cdc61b9c6a 100644 --- a/resolv/nss_dns/dns-canon.c +++ b/resolv/nss_dns/dns-canon.c @@ -20,6 +20,7 @@ #include <netdb.h> #include <resolv.h> #include <stdlib.h> +#include <stdint.h> #include <arpa/nameser.h> #include <nsswitch.h> diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index 5c725b5f67..3c4db7eec3 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -61,6 +61,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include "nsswitch.h" #include <arpa/inet.h> diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 3daa44e273..784343994b 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -573,7 +573,7 @@ p_option(u_long option) { case RES_INIT: return "init"; case RES_DEBUG: return "debug"; case RES_AAONLY: return "aaonly(unimpl)"; - case RES_USEVC: return "usevc"; + case RES_USEVC: return "use-vc"; case RES_PRIMARY: return "primry(unimpl)"; case RES_IGNTC: return "igntc"; case RES_RECURSE: return "recurs"; @@ -582,11 +582,17 @@ p_option(u_long option) { case RES_DNSRCH: return "dnsrch"; case RES_INSECURE1: return "insecure1"; case RES_INSECURE2: return "insecure2"; + case RES_NOALIASES: return "noaliases"; case RES_USE_INET6: return "inet6"; case RES_ROTATE: return "rotate"; - case RES_NOCHECKNAME: return "no-check-names"; - case RES_USEBSTRING: return "ip6-bytstring"; + case RES_NOCHECKNAME: return "no-check-names(unimpl)"; + case RES_KEEPTSIG: return "keeptsig(unimpl)"; + case RES_BLAST: return "blast"; + case RES_USEBSTRING: return "ip6-bytestring"; + case RES_NOIP6DOTINT: return "no-ip6-dotint"; case RES_USE_EDNS0: return "edns0"; + case RES_SNGLKUP: return "single-request"; + case RES_SNGLKUPREOP: return "single-request-reopen"; case RES_USE_DNSSEC: return "dnssec"; case RES_NOTLDQUERY: return "no-tld-query"; /* XXX nonreentrant */ diff --git a/resolv/res_init.c b/resolv/res_init.c index c58c763841..002dec5c57 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -77,6 +77,7 @@ static const char rcsid[] = "$BINDId: res_init.c,v 8.16 2000/05/09 07:10:12 vixi #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <stdint.h> #include <arpa/inet.h> #include <arpa/nameser.h> #include <net/if.h> diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c index 2bc2d2497f..e2c6a742c0 100644 --- a/resolv/res_mkquery.c +++ b/resolv/res_mkquery.c @@ -83,6 +83,7 @@ static const char rcsid[] = "$BINDId: res_mkquery.c,v 8.12 1999/10/13 16:39:40 v #ifdef _LIBC # include <hp-timing.h> +# include <stdint.h> # if HP_TIMING_AVAIL # define RANDOM_BITS(Var) { uint64_t v64; HP_TIMING_NOW (v64); Var = v64; } # endif diff --git a/resolv/resolv.h b/resolv/resolv.h index ed15a702bf..53c3bba182 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -207,7 +207,7 @@ struct res_sym { #define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ #define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ #define RES_ROTATE 0x00004000 /* rotate ns list after each query */ -#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity. */ +#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity (!IMPL) */ #define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */ #define RES_BLAST 0x00020000 /* blast all recursive servers */ #define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte diff --git a/resolv/tst-aton.c b/resolv/tst-aton.c index 6cb5960496..4e9caf96f4 100644 --- a/resolv/tst-aton.c +++ b/resolv/tst-aton.c @@ -1,4 +1,5 @@ #include <stdio.h> +#include <stdint.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> |