BIND 10 trac2326, updated. 8679b4053024172db8e3d55b7ed50a855efc77c0 [2326] Message log about wrong IAID fixed in DHCPv6

[BIND 10 source code commits]

The branch, trac2326 has been updated
       via  8679b4053024172db8e3d55b7ed50a855efc77c0 (commit)
      from  c864447b8ec187264fac032be1561c77bb3103b6 (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 8679b4053024172db8e3d55b7ed50a855efc77c0
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Thu Jan 3 14:14:10 2013 +0100

    [2326] Message log about wrong IAID fixed in DHCPv6

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

Summary of changes:
 src/bin/dhcp6/dhcp6_messages.mes |    4 ++--
 src/bin/dhcp6/dhcp6_srv.cc       |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 87277d9..df722c9 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -105,14 +105,14 @@ intervention (e.g. check if DHCP process has sufficient privileges to
 update the database). It may also be triggered if a lease was manually
 removed from the database during RELEASE message processing.
 
-% DHCP6_RELEASE_FAIL_WRONG_DUID client (duid=%2) tried to release address %2, but it belongs to client (duid=%3)
+% DHCP6_RELEASE_FAIL_WRONG_DUID client (duid=%1) tried to release address %2, but it belongs to client (duid=%3)
 This warning message indicates that client tried to release an address
 that belongs to a different client. This should not happen in normal
 circumstances and may indicate a misconfiguration of the client.  However,
 since the client releasing the address will stop using it anyway, there
 is a good chance that the situation will correct itself.
 
-% DHCP6_RELEASE_FAIL_WRONG_IAID client (duid=%2) tried to release address %2, but it used wrong IAID (expected %4, but got %3)
+% DHCP6_RELEASE_FAIL_WRONG_IAID client (duid=%1) tried to release address %2, but it used wrong IAID (expected %3, but got %4)
 This warning message indicates that client tried to release an address
 that does belong to it, but the address was expected to be in a different
 IA (identity association) container. This probably means that the client's
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 2d9534c..f5ab8ab 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -809,8 +809,8 @@ OptionPtr Dhcpv6Srv::releaseIA_NA(const DuidPtr& duid, Pkt6Ptr question,
         // Sorry, it's not your address. You can't release it.
 
         LOG_WARN(dhcp6_logger, DHCP6_RELEASE_FAIL_WRONG_DUID)
-            .arg(release_addr->getAddress().toText())
             .arg(duid->toText())
+            .arg(release_addr->getAddress().toText())
             .arg(lease->duid_->toText());
 
         general_status = STATUS_NoBinding;
@@ -822,10 +822,10 @@ OptionPtr Dhcpv6Srv::releaseIA_NA(const DuidPtr& duid, Pkt6Ptr question,
     if (ia->getIAID() != lease->iaid_) {
         // This address belongs to this client, but to a different IA
         LOG_WARN(dhcp6_logger, DHCP6_RELEASE_FAIL_WRONG_IAID)
-            .arg(release_addr->getAddress().toText())
             .arg(duid->toText())
-            .arg(ia->getIAID())
+            .arg(release_addr->getAddress().toText())
             .arg(lease->iaid_);
+            .arg(ia->getIAID())
         ia_rsp->addOption(createStatusCode(STATUS_NoBinding,
                           "This is your address, but you used wrong IAID"));
         general_status = STATUS_NoBinding;