From: Michal 'vorner' Vaner Date: Mon, 26 Nov 2012 10:13:16 +0000 (+0100) Subject: Merge #2376 X-Git-Tag: bind10-1.0.0-beta-release~84^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5eee92f9b673b5a88e902d8ae65c19c886b3400;p=thirdparty%2Fkea.git Merge #2376 Conflicts: src/lib/datasrc/datasrc_messages.mes --- c5eee92f9b673b5a88e902d8ae65c19c886b3400 diff --cc src/lib/datasrc/datasrc_messages.mes index 3359d24ef7,94e4140fa3..e7cb9d3f9d --- a/src/lib/datasrc/datasrc_messages.mes +++ b/src/lib/datasrc/datasrc_messages.mes @@@ -305,16 -305,23 +305,28 @@@ Therefore, the zone will not be availab a problem, you should move the zone to some database backend (sqlite3, for example) and use it from there. +% DATASRC_LOAD_FROM_FILE_ERROR Error loading zone %1: %2 +An error was found in the zone data when it was being loaded from a +file. The zone was not loaded. The specific error is shown in the +message, and should be addressed. + +% DATASRC_LOAD_FROM_ITERATOR_ERROR Error loading zone %1: %2 +An error was found in the zone data when it was being loaded from +another data source. The zone was not loaded. The specific error is +shown in the message, and should be addressed. + + % DATASRC_MASTER_LOAD_ERROR %1:%2: Zone '%3/%4' contains error: %5 + There's an error in the given master file. The zone won't be loaded for + this reason. Parsing might follow, so you might get further errors and + warnings to fix everything at once. But in case the error is serious enough, + the parser might just give up or get confused and generate false errors + afterwards. + + % DATASRC_MASTER_LOAD_WARN %1:%2: Zone '%3/%4' has a potential problem: %5 + There's something suspicious in the master file. This is a warning only. + It may be a problem or it may be harmless, but it should be checked. + This problem does not stop the zone from being loaded. + -% DATASRC_MASTERLOAD_ERROR %1 -An error was found in the zone data for a MasterFiles zone. The zone -is not loaded. The specific error is shown in the message, and should -be addressed. - % DATASRC_MEM_ADD_RRSET adding RRset '%1/%2' into zone '%3' Debug information. An RRset is being added to the in-memory data source.