BIND 10 trac2108_3, updated. 558aff98969b401f7505bcc69fd8a1356e157084 [2108] Fix NSEC3PARAM variable name

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  558aff98969b401f7505bcc69fd8a1356e157084 (commit)
       via  0c4fd3055fe7714ded8851090c4b7b2490136f32 (commit)
      from  c13e1fbaea4f33b0385ffb5bdb23a3fcefda7391 (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 558aff98969b401f7505bcc69fd8a1356e157084
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Sep 4 13:18:11 2012 +0530

    [2108] Fix NSEC3PARAM variable name

commit 0c4fd3055fe7714ded8851090c4b7b2490136f32
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Sep 4 13:17:30 2012 +0530

    [2108] Fix namespace of node flags

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

Summary of changes:
 src/lib/datasrc/memory/memory_client.cc |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 1b683e2..0d1722f 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -476,10 +476,10 @@ public:
         // indicating the need for callback in find().
         if (rrset->getType() == RRType::NS() &&
             rrset->getName() != zone_name) {
-            node->setFlag(DomainNode::FLAG_CALLBACK);
+            node->setFlag(ZoneNode::FLAG_CALLBACK);
             // If it is DNAME, we have a callback as well here
         } else if (rrset->getType() == RRType::DNAME()) {
-            node->setFlag(DomainNode::FLAG_CALLBACK);
+            node->setFlag(ZoneNode::FLAG_CALLBACK);
         }
 
         // If we've added NSEC3PARAM at zone origin, set up NSEC3 specific
@@ -493,15 +493,15 @@ public:
 
             NSEC3Data* nsec3_data = zone_data.getNSEC3Data();
             if (nsec3_data == NULL) {
-                nsec3_data = NSEC3Data::create(local_mem_sgmt_, nsec3_rdata);
+                nsec3_data = NSEC3Data::create(local_mem_sgmt_, param);
                 zone_data.setNSEC3Data(nsec3_data);
             } else {
                 size_t salt_len = nsec3_data->getSaltLen();
                 const uint8_t* salt_data = nsec3_data->getSaltData();
-                const vector<uint8_t>& salt_data_2 = nsec3_rdata.getSalt();
+                const vector<uint8_t>& salt_data_2 = param.getSalt();
 
-                if ((nsec3_rdata.getHashalg() != nsec3_data->hashalg) ||
-                    (nsec3_rdata.getIterations() != nsec3_data->iterations) ||
+                if ((param.getHashalg() != nsec3_data->hashalg) ||
+                    (param.getIterations() != nsec3_data->iterations) ||
                     (salt_data_2.size() != salt_len) ||
                     (std::memcmp(&salt_data_2[0], salt_data, salt_len) != 0)) {
                     isc_throw(AddError,