← Back to branch summary

~ubuntu-branches/debian/sid/isc-dhcp/sid

« back to all changes in this revision

Viewing changes to server/mdb6.c

  • Committer: Package Import Robot
  • Author(s): Michael Gilbert, Andrew Pollock, Michael Gilbert
  • Date: 2012-04-28 16:00:49 UTC
  • Revision ID: package-import@ubuntu.com-20120428160049-e9p426h82w2i6qdq
Tags: 4.2.2.dfsg.1-5
http://bugs.debian.org/151820
http://bugs.debian.org/655746
http://bugs.debian.org/652259
[ Andrew Pollock ]
* debian/dhclient.conf: send the hostname (closes: #151820) 

[ Michael Gilbert ]
* Fix cve-2011-4868: error in DDNS handling with IPv6 (closes: #655746)
* Fix cve-2011-4539: error in regular expression handling
  (closes: #652259)
* Make dependencies diff-able
* Add myself to uploaders
* Remove all automatically generated files in clean rule
* Medium urgency for security updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/mdb6.c
1058
1058
#if defined (NSUPDATE)
1059
1059
                /* Process events upon expiration. */
1060
1060
                if (pool->pool_type != D6O_IA_PD) {
1061
 
                        ddns_removals(NULL, lease, NULL);
 
1061
                        ddns_removals(NULL, lease, NULL, ISC_FALSE);
1062
1062
                }
1063
1063
#endif
1064
1064
 
1466
1466
                 * Note that if there are no leases in the pool, 
1467
1467
                 * expire_lease6() will return ISC_R_SUCCESS with 
1468
1468
                 * a NULL lease.
 
1469
                 *
 
1470
                 * expire_lease6() will call move_lease_to_inactive() which
 
1471
                 * calls ddns_removals() do we want that on the standard
 
1472
                 * expiration timer or a special 'depref' timer?  Original
 
1473
                 * query from DH, moved here by SAR.
1469
1474
                 */
1470
1475
                lease = NULL;
1471
1476
                if (expire_lease6(&lease, pool, cur_time) != ISC_R_SUCCESS) {
1475
1480
                        break;
1476
1481
                }
1477
1482
 
1478
 
                /* Look to see if there were ddns updates, and if
1479
 
                 * so, drop them.
1480
 
                 *
1481
 
                 * DH: Do we want to do this on a special 'depref'
1482
 
                 * timer rather than expiration timer?
1483
 
                 */
1484
 
#if defined (NSUPDATE)
1485
 
                if (pool->pool_type != D6O_IA_PD) {
1486
 
                        ddns_removals(NULL, lease, NULL);
1487
 
                }
1488
 
#endif
1489
 
 
1490
1483
                write_ia(lease->ia);
1491
1484
 
1492
1485
                iasubopt_dereference(&lease, MDL);