← Back to branch summary

~andreserl/ubuntu/lucid/bind9/bind9-apport-533601

« back to all changes in this revision

Viewing changes to lib/dns/zone.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones
  • Date: 2009-01-26 10:33:42 UTC
  • mfrom: (1.4.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090126103342-zfv3z8v6jgci62tg
http://bugs.debian.org/511936
http://bugs.debian.org/511768
* New upstream patch release
  - supportable version of fix from 9.5.0.dfsg.P2-5.1
  - CVE-2009-0025:  Closes: #511936
  - 2475: Overly agressive cache entry removal.  Closes: #511768
  - other bug fixes worthy of patch-release inclusion

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/dns/zone.c
15
15
 * PERFORMANCE OF THIS SOFTWARE.
16
16
 */
17
17
 
18
 
/* $Id: zone.c,v 1.470.12.5 2008/04/07 05:30:58 marka Exp $ */
 
18
/* $Id: zone.c,v 1.470.12.6 2008/10/24 00:36:25 marka Exp $ */
19
19
 
20
20
/*! \file */
21
21
 
1767
1767
        if (result == DNS_R_NXRRSET || result == DNS_R_NXDOMAIN ||
1768
1768
            result == DNS_R_EMPTYNAME || result == DNS_R_DELEGATION) {
1769
1769
                const char *what;
1770
 
                if (dns_name_issubdomain(name, owner))
 
1770
                isc_boolean_t required = ISC_FALSE;
 
1771
                if (dns_name_issubdomain(name, owner)) {
1771
1772
                        what = "REQUIRED GLUE ";
1772
 
                else if (result == DNS_R_DELEGATION)
 
1773
                        required = ISC_TRUE;
 
1774
                 } else if (result == DNS_R_DELEGATION)
1773
1775
                        what = "SIBLING GLUE ";
1774
1776
                else
1775
1777
                        what = "";
1776
1778
 
1777
 
                if (result != DNS_R_DELEGATION ||
 
1779
                if (result != DNS_R_DELEGATION || required ||
1778
1780
                    DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKSIBLING)) {
1779
1781
                        dns_zone_log(zone, level, "%s/NS '%s' has no %s"
1780
1782
                                     "address records (A or AAAA)",