← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/named/xfrout.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:
bin/named/xfrout.c
15
15
 * PERFORMANCE OF THIS SOFTWARE.
16
16
 */
17
17
 
18
 
/* $Id: xfrout.c,v 1.126.128.2 2008/04/03 06:20:33 tbox Exp $ */
 
18
/* $Id: xfrout.c,v 1.126.128.4 2008/10/29 03:01:04 marka Exp $ */
19
19
 
20
20
#include <config.h>
21
21
 
314
314
        rdl.type = rdata->type;
315
315
        rdl.rdclass = rdata->rdclass;
316
316
        rdl.ttl = ttl;
 
317
        if (rdata->type == dns_rdatatype_sig ||
 
318
            rdata->type == dns_rdatatype_rrsig)
 
319
                rdl.covers = dns_rdata_covers(rdata);
 
320
        else
 
321
                rdl.covers = dns_rdatatype_none;
317
322
        ISC_LIST_INIT(rdl.rdata);
318
323
        ISC_LINK_INIT(&rdl, link);
319
324
        dns_rdataset_init(&rds);
1333
1338
        xfr->zone = NULL;
1334
1339
        xfr->db = NULL;
1335
1340
        xfr->ver = NULL;
1336
 
        dns_zone_attach(zone, &xfr->zone);
 
1341
        if (zone != NULL)       /* zone will be NULL if it's DLZ */
 
1342
                dns_zone_attach(zone, &xfr->zone);
1337
1343
        dns_db_attach(db, &xfr->db);
1338
1344
        dns_db_attachversion(db, ver, &xfr->ver);
1339
1345
        xfr->end_of_stream = ISC_FALSE;
1591
1597
                msgrdl->type = rdata->type;
1592
1598
                msgrdl->rdclass = rdata->rdclass;
1593
1599
                msgrdl->ttl = ttl;
 
1600
                if (rdata->type == dns_rdatatype_sig ||
 
1601
                    rdata->type == dns_rdatatype_rrsig)
 
1602
                        msgrdl->covers = dns_rdata_covers(rdata);
 
1603
                else
 
1604
                        msgrdl->covers = dns_rdatatype_none;
1594
1605
                ISC_LINK_INIT(msgrdl, link);
1595
1606
                ISC_LIST_INIT(msgrdl->rdata);
1596
1607
                ISC_LIST_APPEND(msgrdl->rdata, msgrdata, link);