diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2008-12-14 19:39:53 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2008-12-14 19:39:53 +0000 |
| commit | 54ebdd631db8c0bba2baab0155f603a8b5cf014a (patch) | |
| tree | 5e14eb7d469e63a149e56aedf1a74b40e820e7cd /include/arpa/nameser.h | |
| parent | c5349d33845c1256a3151e869b85015f2be9a864 (diff) | |
| download | src-54ebdd631db8c0bba2baab0155f603a8b5cf014a.tar.gz src-54ebdd631db8c0bba2baab0155f603a8b5cf014a.zip | |
Merge the resolver part of BIND 9.4.3 into HEAD.
It includes the following fix:
2426. [bug] libbind: inet_net_pton() can sometimes return the
wrong value if excessively large netmasks are
supplied. [RT #18512]
Reported by: Maksymilian Arciemowicz <cxib__at__securityreason.com>
Notes
Notes:
svn path=/head/; revision=186090
Diffstat (limited to 'include/arpa/nameser.h')
| -rw-r--r-- | include/arpa/nameser.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index b8910263aef0..ce2f2e062a4c 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -49,7 +49,7 @@ */ /* - * $Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $ + * $Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $ * $FreeBSD$ */ @@ -424,9 +424,10 @@ typedef enum __ns_cert_types { #define NS_NXT_MAX 127 /*% - * EDNS0 extended flags, host order. + * EDNS0 extended flags and option codes, host order. */ #define NS_OPT_DNSSEC_OK 0x8000U +#define NS_OPT_NSID 3 /*% * Inline versions of get/put short/long. Pointer is advanced. |