BIND 10 trac1790, updated. f2c25b53985bf2c5e3b4e5d9aaffca1b0dccc2e4 [1790] Don't use the same log message id twice

[BIND 10 source code commits]

The branch, trac1790 has been updated
       via  f2c25b53985bf2c5e3b4e5d9aaffca1b0dccc2e4 (commit)
      from  bb88241fc84644f9f998eefeb39ba1f140ba1edd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f2c25b53985bf2c5e3b4e5d9aaffca1b0dccc2e4
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu May 3 10:22:28 2012 +0530

    [1790] Don't use the same log message id twice

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.py.in        |    6 +++---
 src/bin/xfrin/xfrin_messages.mes |    7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 529843b..2afb876 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1555,8 +1555,8 @@ class Xfrin:
                     dclass = RRClass(d["class"])
                 else:
                     dclass = RRClass("IN")
-            except InvalidRRType as err:
-                logger.info(XFRIN_AUTH_CONFIG_ERROR, str(err))
+            except InvalidRRClass as err:
+                logger.info(XFRIN_AUTH_CONFIG_RRCLASS_ERROR, str(err))
                 continue
 
             if d["type"].lower() == "memory" and dclass == zone_class:
@@ -1566,7 +1566,7 @@ class Xfrin:
                     try:
                         name = Name(zone["origin"])
                     except (EmptyLabel, TooLongLabel, BadLabelType, BadEscape, TooLongName, IncompleteName):
-                        logger.info(XFRIN_AUTH_CONFIG_ERROR, str(err))
+                        logger.info(XFRIN_AUTH_CONFIG_NAME_PARSER_ERROR, str(err))
                         continue
 
                     if zone["filetype"].lower() == "sqlite3" and name == zone_name:
diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index 388159e..60d7c9c 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -121,8 +121,11 @@ likely means that the msgq daemon has quit or was killed.
 There was a problem sending a message to b10-auth. This most likely
 means that the msgq daemon has quit or was killed.
 
-% XFRIN_AUTH_CONFIG_ERROR Error parsing Auth configuration: %1
-There was an error when parsing Auth configuration.
+% XFRIN_AUTH_CONFIG_RRCLASS_ERROR Invalid RRClass when parsing Auth configuration: %1
+There was an invalid RR class when parsing Auth configuration.
+
+% XFRIN_AUTH_CONFIG_NAME_PARSER_ERROR Invalid name when parsing Auth configuration: %1
+There was an invalid name when parsing Auth configuration.
 
 % XFRIN_AUTH_LOADZONE sending Auth loadzone for origin=%1, class=%2, datasrc=%3
 There was a successful zone transfer, and the zone is served by b10-auth