Commit 79e6f6e5 authored by Evan Hunt's avatar Evan Hunt

[master] deprecate dns_journal_rollforward2

no longer needed since change #3641
parent 3ad8f24d
......@@ -235,19 +235,12 @@ dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, isc_uint32_t *ttl,
isc_result_t
dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
const char *filename);
isc_result_t
dns_journal_rollforward2(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
isc_uint32_t resign, const char *filename);
/*%<
* Roll forward (play back) the journal file "filename" into the
* database "db". This should be called when the server starts
* after a shutdown or crash. 'resign' is how many seconds before
* a RRSIG is due to expire it should be scheduled to be regenerated.
* after a shutdown or crash.
*
* Requires:
*\li dns_journal_rollforward() requires that DNS_JOURNALOPT_RESIGN
* is not set.
*\li 'mctx' is a valid memory context.
*\li 'db' is a valid database which does not have a version
* open for writing.
......
......@@ -1258,9 +1258,7 @@ dns_journal_destroy(dns_journal_t **journalp) {
/* XXX Share code with incoming IXFR? */
static isc_result_t
roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options,
isc_uint32_t resign)
{
roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) {
isc_buffer_t source; /* Transaction data from disk */
isc_buffer_t target; /* Ditto after _fromwire check */
isc_uint32_t db_serial; /* Database SOA serial */
......@@ -1392,16 +1390,8 @@ roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options,
}
isc_result_t
dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db,
unsigned int options, const char *filename)
{
REQUIRE((options & DNS_JOURNALOPT_RESIGN) == 0);
return (dns_journal_rollforward2(mctx, db, options, 0, filename));
}
isc_result_t
dns_journal_rollforward2(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
isc_uint32_t resign, const char *filename)
dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
const char *filename)
{
dns_journal_t *j;
isc_result_t result;
......@@ -1421,7 +1411,7 @@ dns_journal_rollforward2(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
if (JOURNAL_EMPTY(&j->header))
result = DNS_R_UPTODATE;
else
result = roll_forward(j, db, options, resign);
result = roll_forward(j, db, options);
dns_journal_destroy(&j);
......
......@@ -4096,8 +4096,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
options = DNS_JOURNALOPT_RESIGN;
else
options = 0;
result = dns_journal_rollforward2(zone->mctx, db, options,
0, zone->journal);
result = dns_journal_rollforward(zone->mctx, db, options,
zone->journal);
if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND &&
result != DNS_R_UPTODATE && result != DNS_R_NOJOURNAL &&
result != ISC_R_RANGE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment