BIND 10 master, updated. b6d00d5fb3657b555c9f25d4c23721d277a7d7a4 Merge branch 'master' into trac2593

[BIND 10 source code commits]

The branch, master has been updated
       via  b6d00d5fb3657b555c9f25d4c23721d277a7d7a4 (commit)
       via  d86e308e8d1cf3c569f9ad1edf17bb4289da954c (commit)
      from  68709a07c59441cd101e750d72049a6218f0262b (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 b6d00d5fb3657b555c9f25d4c23721d277a7d7a4
Merge: d86e308 68709a0
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 11 14:31:08 2013 +0530

    Merge branch 'master' into trac2593

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

Summary of changes:
 src/lib/dns/master_loader.cc |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index 01bf671..400db43 100644
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -222,7 +222,12 @@ private:
         const MaybeRRClass rrclass =
             RRClass::createFromText(rrparam_token.getString());
         if (rrclass) {
-            if (*rrclass != zone_class_) {
+            // FIXME: The following code re-parses the rrparam_token to
+            // make an RRClass instead of using the MaybeRRClass above,
+            // because some old versions of boost::optional (that we
+            // still want to support) have a bug (see trac #2593). This
+            // workaround should be removed at some point in the future.
+            if (RRClass(rrparam_token.getString()) != zone_class_) {
                 isc_throw(InternalException, "Class mismatch: " << *rrclass <<
                           " vs. " << zone_class_);
             }