From: Automatic Updater Date: Wed, 4 Nov 2009 23:47:25 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.6.1-P2~2^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1b08748d8f95e85a47c3ae6e08f22cd074bc2dc;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index 67adb113118..a1e16e44878 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: journal.h,v 1.33.120.3 2009/11/04 01:35:07 marka Exp $ */ +/* $Id: journal.h,v 1.33.120.4 2009/11/04 23:47:25 tbox Exp $ */ #ifndef DNS_JOURNAL_H #define DNS_JOURNAL_H 1 @@ -240,10 +240,10 @@ dns_journal_rollforward2(isc_mem_t *mctx, dns_db_t *db, unsigned int options, * 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. + * a RRSIG is due to expire it should be scheduled to be regenerated. * * Requires: - *\li dns_journal_rollforward() requires that DNS_JOURNALOPT_RESIGN + *\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 diff --git a/lib/dns/journal.c b/lib/dns/journal.c index d06996d12a2..638e64755b5 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: journal.c,v 1.103.48.5 2009/11/04 04:21:57 marka Exp $ */ +/* $Id: journal.c,v 1.103.48.6 2009/11/04 23:47:25 tbox Exp $ */ #include @@ -1973,7 +1973,7 @@ isc_result_t dns_db_diff(isc_mem_t *mctx, dns_db_t *dba, dns_dbversion_t *dbvera, dns_db_t *dbb, dns_dbversion_t *dbverb, - const char *journal_filename) + const char *journal_filename) { isc_result_t result; dns_journal_t *journal = NULL;