diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Banner | 2 | ||||
| -rw-r--r-- | resolv/arpa/nameser.h | 4 | ||||
| -rw-r--r-- | resolv/inet_net_pton.c | 2 | ||||
| -rw-r--r-- | resolv/netdb.h | 4 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-network.c | 2 | ||||
| -rw-r--r-- | resolv/res_comp.c | 55 | ||||
| -rw-r--r-- | resolv/res_debug.c | 2 | ||||
| -rw-r--r-- | resolv/res_init.c | 2 | ||||
| -rw-r--r-- | resolv/res_send.c | 2 | ||||
| -rw-r--r-- | resolv/resolv.h | 20 |
10 files changed, 23 insertions, 72 deletions
diff --git a/resolv/Banner b/resolv/Banner index 0cf0de3f6f..d11ab500fb 100644 --- a/resolv/Banner +++ b/resolv/Banner @@ -1 +1 @@ -BIND-4.9.5-REL +BIND-4.9.5-P1 diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 66b3530d91..4db67d0602 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -308,7 +308,7 @@ typedef struct { /* fields in third byte */ unsigned qr: 1; /* response flag */ unsigned opcode: 4; /* purpose of message */ - unsigned aa: 1; /* authoritive answer */ + unsigned aa: 1; /* authoritative answer */ unsigned tc: 1; /* truncated message */ unsigned rd: 1; /* recursion desired */ /* fields in fourth byte */ @@ -322,7 +322,7 @@ typedef struct { /* fields in third byte */ unsigned rd :1; /* recursion desired */ unsigned tc :1; /* truncated message */ - unsigned aa :1; /* authoritive answer */ + unsigned aa :1; /* authoritative answer */ unsigned opcode :4; /* purpose of message */ unsigned qr :1; /* response flag */ /* fields in fourth byte */ diff --git a/resolv/inet_net_pton.c b/resolv/inet_net_pton.c index bf6fe02ed8..0c2693136d 100644 --- a/resolv/inet_net_pton.c +++ b/resolv/inet_net_pton.c @@ -166,7 +166,7 @@ inet_net_pton_ipv4(src, dst, size) goto emsgsize; } - /* Firey death and destruction unless we prefetched EOS. */ + /* Fiery death and destruction unless we prefetched EOS. */ if (ch != '\0') goto enoent; diff --git a/resolv/netdb.h b/resolv/netdb.h index f906edac0b..73192b5e98 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -73,7 +73,7 @@ __set_h_errno (int __err) #define NETDB_INTERNAL -1 /* See errno. */ #define NETDB_SUCCESS 0 /* No problem. */ #define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found. */ -#define TRY_AGAIN 2 /* Non-Authoritive Host not found, +#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL. */ #define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP. */ @@ -98,7 +98,7 @@ struct hostent int h_addrtype; /* Host address type. */ int h_length; /* Length of address. */ char **h_addr_list; /* List of addresses from name server. */ -#define h_addr h_addr_list[0] /* Address, for backward compatiblity. */ +#define h_addr h_addr_list[0] /* Address, for backward compatibility. */ }; /* Open host data base files and mark them as staying open even after diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index 94fa1c13c4..37aa29fb21 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -96,7 +96,7 @@ typedef union querybuf } querybuf; -/* Protortypes for local functions. */ +/* Prototypes for local functions. */ static enum nss_status getanswer_r (const querybuf *answer, int anslen, struct netent *result, char *buffer, int buflen, lookup_method net_i); diff --git a/resolv/res_comp.c b/resolv/res_comp.c index d96fe6e432..a9ca69e55f 100644 --- a/resolv/res_comp.c +++ b/resolv/res_comp.c @@ -160,7 +160,7 @@ dn_expand(msg, eomorig, comp_dn, exp_dn, length) * 'length' is the size of the array pointed to by 'comp_dn'. * 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0] * is a pointer to the beginning of the message. The list ends with NULL. - * 'lastdnptr' is a pointer to the end of the arrary pointed to + * 'lastdnptr' is a pointer to the end of the array pointed to * by 'dnptrs'. Side effect is to update the list of pointers for * labels inserted into the message as we compress the name. * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' @@ -504,56 +504,3 @@ __putlong(l, msgp) { PUTLONG(l, msgp); } - -#ifdef ultrix -/* ultrix 4.0 had some icky packaging in its libc.a. alias for it here. - * there is more gunk of this kind over in res_debug.c. - */ -#undef putshort -void -#if defined(__STDC__) || defined(__cplusplus) -putshort(register u_short s, register u_char *msgp) -#else -putshort(s, msgp) - register u_short s; - register u_char *msgp; -#endif -{ - __putshort(s, msgp); -} -#undef putlong -void -putlong(l, msgp) - register u_int32_t l; - register u_char *msgp; -{ - __putlong(l, msgp); -} - -#undef dn_comp -int -dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr) - const char *exp_dn; - u_char *comp_dn, **dnptrs, **lastdnptr; - int length; -{ - return (__dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)); -} - -#undef dn_expand -int -dn_expand(msg, eomorig, comp_dn, exp_dn, length) - const u_char *msg, *eomorig, *comp_dn; - char *exp_dn; - int length; -{ - return (__dn_expand(msg, eomorig, comp_dn, exp_dn, length)); -} - -#undef dn_skipname -dn_skipname(comp_dn, eom) - const u_char *comp_dn, *eom; -{ - return (__dn_skipname(comp_dn, eom)); -} -#endif /* Ultrix 4.0 hackery */ diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 8fb4bcf33f..23f27acb33 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -287,7 +287,7 @@ __fp_nquery(msg, len, file) if ((_res.options & RES_INIT) == 0 && res_init() == -1) return; -#define TruncTest(x) if (x >= endMark) goto trunc +#define TruncTest(x) if (x > endMark) goto trunc #define ErrorTest(x) if (x == NULL) goto error /* diff --git a/resolv/res_init.c b/resolv/res_init.c index 459948660d..91f9f40094 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -95,7 +95,7 @@ static char rcsid[] = "$Id$"; * "search" property. * - The sortlist comprised of IP address netmask pairs are stored as * values of the "sortlist" property. The IP address and optional netmask - * should be seperated by a slash (/) or ampersand (&) character. + * should be separated by a slash (/) or ampersand (&) character. * - Internal resolver variables can be set from the value of the "options" * property. */ diff --git a/resolv/res_send.c b/resolv/res_send.c index a5b4fba44b..60d8ef2fb9 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -96,7 +96,7 @@ static char rcsid[] = "$Id$"; static int s = -1; /* socket used for communications */ static int connected = 0; /* is the socket connected */ -static int vc = 0; /* is the socket a virtual ciruit? */ +static int vc = 0; /* is the socket a virtual circuit? */ #ifndef FD_SET /* XXX - should be in portability.h */ diff --git a/resolv/resolv.h b/resolv/resolv.h index fe90ab5a75..b14cda0634 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -83,7 +83,7 @@ /* * Resolver configuration file. * Normally not present, but may contain the address of the - * inital name server(s) to query and the domain search list. + * initial name server(s) to query and the domain search list. */ #ifndef _PATH_RESCONF @@ -103,7 +103,7 @@ #define RES_MAXNDOTS 15 /* should reflect bit field size */ struct __res_state { - int retrans; /* retransmition time interval */ + int retrans; /* retransmission time interval */ int retry; /* number of times to retransmit */ u_long options; /* option flags - see below. */ int nscount; /* number of name servers */ @@ -224,18 +224,22 @@ extern const struct res_sym __p_type_syms[]; #define p_secstodate __p_secstodate #define dn_count_labels __dn_count_labels #define dn_comp __dn_comp -#define dn_expand __dn_expand -#define res_init __res_init #define res_randomid __res_randomid -#define res_query __res_query -#define res_search __res_search -#define res_querydomain __res_querydomain -#define res_mkquery __res_mkquery #define res_send __res_send #define res_isourserver __res_isourserver #define res_nameinquery __res_nameinquery #define res_queriesmatch __res_queriesmatch #define res_close __res_close + +#ifdef BIND_RES_POSIX3 +#define dn_expand __dn_expand +#define res_init __res_init +#define res_query __res_query +#define res_search __res_search +#define res_querydomain __res_querydomain +#define res_mkquery __res_mkquery +#endif + __BEGIN_DECLS int res_hnok __P((const char *)); int res_ownok __P((const char *)); |