[master] Merge branch 'trac3341'

diff --cc src/bin/d2/d2_messages.mes
index 1c7415d834dac8959870b053963da4acb873c5c8,69b4a09fe81d80ac4dcc1376b1333a9b76a5c5fa..bf2be44621cf390264a59028d5519a1ba1bc4d6f
--- 1/src/bin/d2/d2_messages.mes
--- 2/src/bin/d2/d2_messages.mes
+++ b/src/bin/d2/d2_messages.mes
@@@ -112,6 -112,15 +112,15 @@@ service first starts
  This is an informational message issued when the controller is exiting
  following a shut down (normal or otherwise) of the service.
  
 -% DHCP_DDNS_ADD_FAILED DHCP_DDNS failed attempting to make DNS mapping additions for this request: %1, event: %2
++% DHCP_DDNS_ADD_FAILED DHCP_DDNS Transaction outcome: %1
+ This is an error message issued after DHCP_DDNS attempts to submit DNS mapping
+ entry additions have failed.  The precise reason for the failure should be
+ documented in preceding log entries.
+ 
+ % DHCP_DDNS_ADD_SUCCEEDED DHCP_DDNS successfully added the DNS mapping addition for this request: %1
 -This is a debug message issued after DHCP_DDNS has submitted DNS mapping
 -additions which were received and accepted by an appropriate DNS server.
++This is an informational message issued after DHCP_DDNS has submitted DNS
++mapping additions which were received and accepted by an appropriate DNS server.
+ 
  % DHCP_DDNS_AT_MAX_TRANSACTIONS application has %1 queued requests but has reached maximum number of %2 concurrent transactions
  This is a debug message that indicates that the application has DHCP_DDNS
  requests in the queue but is working as many concurrent requests as allowed.
@@@ -241,65 -358,38 +358,38 @@@ receive was unexpected interrupted.  No
  interrupted as a normal part of stopping the queue manager.  This is most
  likely a programmatic issue that should be reported.
  
- % DHCP_DDNS_RUN_ENTER application has entered the event loop
- This is a debug message issued when the Dhcp-Ddns application enters
- its run method.
- 
- % DHCP_DDNS_RUN_EXIT application is exiting the event loop
- This is a debug message issued when the Dhcp-Ddns exits the
- in event loop.
- 
- % DHCP_DDNS_SHUTDOWN application received shutdown command with args: %1
- This is informational message issued when the application has been instructed
- to shut down by the controller.
- 
- % DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR application encountered an unexpected error while carrying out a NameChangeRequest: %1
- This is error message issued when the application fails to process a
- NameChangeRequest correctly. Some or all of the DNS updates requested as part
- of this update did not succeed. This is a programmatic error and should be
- reported.
- 
- % DHCP_DDNS_FORWARD_ADD_REJECTED DNS Server, %1, rejected a DNS update request to add the address mapping for FQDN, %2, with an RCODE: %3
- This is an error message issued when an update was rejected by the DNS server
- it was sent to for the reason given by the RCODE. The rcode values are defined
- in RFC 2136.
 -% DHCP_DDNS_REMOVE_FAILED DHCP_DDNS failed attempting to make DNS mapping removals for this request: %1, event: %2
++% DHCP_DDNS_REMOVE_FAILED DHCP_DDNS Transaction outcome: %1
+ This is an error message issued after DHCP_DDNS attempts to submit DNS mapping
+ entry removals have failed.  The precise reason for the failure should be
+ documented in preceding log entries.
  
- % DHCP_DDNS_FORWARD_ADD_IO_ERROR DHCP_DDNS encountered an IO error sending a forward mapping add for FQDN %1 to DNS server %2
- This is an error message issued when a communication error occurs while
- DHCP_DDNS is carrying out a forward address update.  The application will
- retry against the same server or others as appropriate.
+ % DHCP_DDNS_REMOVE_SUCCEEDED DHCP_DDNS successfully removed the DNS mapping addition for this request: %1
 -This is a debug message issued after DHCP_DDNS has submitted DNS mapping
 -removals which were received and accepted by an appropriate DNS server.
++This is an informational message issued after DHCP_DDNS has submitted DNS
++mapping removals which were received and accepted by an appropriate DNS server.
  
- % DHCP_DDNS_FORWARD_ADD_RESP_CORRUPT DHCP_DDNS received a corrupt response from the DNS server, %1, while adding forward address mapping for FQDN, %2
- This is an error message issued when the response received by DHCP_DDNS, to a
- update request to add a forward address mapping,  is mangled or malformed.
- The application will retry against the same server or others as appropriate.
+ % DHCP_DDNS_REQUEST_DROPPED Request contains no enabled update requests and will be dropped: %1
+ This is a debug message issued when DHCP_DDNS receives a request which does not
+ contain updates in a direction that is enabled.  In other words, if only forward
+ updates are enabled and request is recevied that asks only for reverse updates
+ then the request is dropped.
  
- % DHCP_DDNS_FORWARD_ADD_BAD_DNSCLIENT_STATUS DHCP_DDNS received an unknown DNSClient status: %1, while adding a forward address mapping for FQDN %2 to DNS server %3
+ % DHCP_DDNS_REVERSE_REMOVE_BAD_DNSCLIENT_STATUS DHCP_DDNS received an unknown DNSClient status: %1, while removing reverse address mapping for FQDN %2 to DNS server %3
  This is an error message issued when DNSClient returns an unrecognized status
- while DHCP_DDNS was adding a forward address mapping.  The request will be
+ while DHCP_DDNS was removing a reverse address mapping.  The request will be
  aborted.  This is most likely a programmatic issue and should be reported.
  
- % DHCP_DDNS_FORWARD_REPLACE_REJECTED DNS Server, %1, rejected a DNS update request to replace the address mapping for FQDN, %2, with an RCODE: %3
- This is an error message issued when an update was rejected by the DNS server
- it was sent to for the reason given by the RCODE. The rcode values are defined
- in RFC 2136.
+ % DHCP_DDNS_REVERSE_REMOVE_BUILD_FAILURE DNS update message to remove a reverse DNS entry could not be constructed from this request: %1,  reason: %2
+ This is an error message issued when an error occurs attempting to construct
+ the server bound packet requesting a reverse PTR removal.  This is
+ due to invalid data contained in the NameChangeRequest. The request will be
+ aborted.  This is most likely a configuration issue.
  
- % DHCP_DDNS_FORWARD_REPLACE_IO_ERROR DHCP_DDNS encountered an IO error sending a forward mapping replace for FQDN %1 to DNS server %2
+ % DHCP_DDNS_REVERSE_REMOVE_IO_ERROR DHCP_DDNS encountered an IO error sending a reverse mapping remove for FQDN %1 to DNS server %2
  This is an error message issued when a communication error occurs while
- DHCP_DDNS is carrying out a forward address update.  The application will
+ DHCP_DDNS is carrying out a reverse address update.  The application will
  retry against the same server or others as appropriate.
  
- % DHCP_DDNS_FORWARD_REPLACE_RESP_CORRUPT DHCP_DDNS received a corrupt response from the DNS server, %1, while replacing forward address mapping for FQDN, %2
- This is an error message issued when the response received by DHCP_DDNS, to a
- update request to replace a forward address mapping,  is mangled or malformed.
- The application will retry against the same server or others as appropriate.
- 
- % DHCP_DDNS_FORWARD_REPLACE_BAD_DNSCLIENT_STATUS DHCP_DDNS received an unknown DNSClient status: %1, while replacing forward address mapping for FQDN %2 to DNS server %3
- This is an error message issued when DNSClient returns an unrecognized status
- while DHCP_DDNS was replacing a forward address mapping.  The request will be
- aborted.  This is most likely a programmatic issue and should be reported.
- 
- % DHCP_DDNS_REVERSE_REPLACE_REJECTED DNS Server, %1, rejected a DNS update request to replace the reverse mapping for FQDN, %2, with an RCODE: %3
+ % DHCP_DDNS_REVERSE_REMOVE_REJECTED DNS Server, %1, rejected a DNS update request to remove the reverse mapping for FQDN, %2, with an RCODE: %3
  This is an error message issued when an update was rejected by the DNS server
  it was sent to for the reason given by the RCODE. The rcode values are defined
  in RFC 2136.
@@@ -388,59 -420,43 +420,45 @@@ This is an error message issued when a
  it was sent to for the reason given by the RCODE. The rcode values are defined
  in RFC 2136.
  
- % DHCP_DDNS_FORWARD_REMOVE_RRS_IO_ERROR DHCP_DDNS encountered an IO error sending a forward RR removal for FQDN %1 to DNS server %2
- This is an error message issued when a communication error occurs while
- DHCP_DDNS is carrying out a forward RR remove.  The application will retry
- against the same server.
- 
- % DHCP_DDNS_FORWARD_REMOVE_RRS_RESP_CORRUPT DHCP_DDNS received a corrupt response from the DNS server, %1, while removing forward RRs for FQDN, %2
+ % DHCP_DDNS_REVERSE_REPLACE_RESP_CORRUPT DHCP_DDNS received a corrupt response from the DNS server, %1, while replacing reverse address mapping for FQDN, %2
  This is an error message issued when the response received by DHCP_DDNS, to a
- update request to remove forward RRs mapping, is mangled or malformed.
+ update request to replace a reverse address,  is mangled or malformed.
  The application will retry against the same server or others as appropriate.
  
- % DHCP_DDNS_FORWARD_REMOVE_RRS_BAD_DNSCLIENT_STATUS DHCP_DDNS received an unknown DNSClient status: %1, while removing forward RRs for FQDN %2 to DNS server %3
- This is an error message issued when DNSClient returns an unrecognized status
- while DHCP_DDNS was removing forward RRs.  The request will be aborted. This is
- most likely a programmatic issue and should be reported.
+ % DHCP_DDNS_REV_REQUEST_IGNORED Reverse updates are disabled, the reverse portion of request will be ignored: %1
+ This is a debug message issued when reverse DNS updates are disabled and
+ DHCP_DDNS receives an update request containing a reverse DNS update.  The
+ reverse update will not performed.
  
- % DHCP_DDNS_REVERSE_REMOVE_BUILD_FAILURE DNS update message to remove a reverse DNS entry could not be constructed from this request: %1,  reason: %2
- This is an error message issued when an error occurs attempting to construct
- the server bound packet requesting a reverse PTR removal.  This is
- due to invalid data contained in the NameChangeRequest. The request will be
- aborted.  This is most likely a configuration issue.
- 
- % DHCP_DDNS_REVERSE_REMOVE_REJECTED DNS Server, %1, rejected a DNS update request to remove the reverse mapping for FQDN, %2, with an RCODE: %3
- This is an error message issued when an update was rejected by the DNS server
- it was sent to for the reason given by the RCODE. The rcode values are defined
- in RFC 2136.
- 
- % DHCP_DDNS_REVERSE_REMOVE_IO_ERROR DHCP_DDNS encountered an IO error sending a reverse mapping remove for FQDN %1 to DNS server %2
- This is an error message issued when a communication error occurs while
- DHCP_DDNS is carrying out a reverse address update.  The application will
- retry against the same server or others as appropriate.
+ % DHCP_DDNS_RUN_ENTER application has entered the event loop
+ This is a debug message issued when the Dhcp-Ddns application enters
+ its run method.
  
- % DHCP_DDNS_REVERSE_REMOVE_RESP_CORRUPT DHCP_DDNS received a corrupt response from the DNS server, %1, while removing reverse address mapping for FQDN, %2
- This is an error message issued when the response received by DHCP_DDNS, to a
- update request to remove a reverse address,  is mangled or malformed.
- The application will retry against the same server or others as appropriate.
+ % DHCP_DDNS_RUN_EXIT application is exiting the event loop
+ This is a debug message issued when the Dhcp-Ddns exits the
+ in event loop.
  
- % DHCP_DDNS_REVERSE_REMOVE_BAD_DNSCLIENT_STATUS DHCP_DDNS received an unknown DNSClient status: %1, while removing reverse address mapping for FQDN %2 to DNS server %3
- This is an error message issued when DNSClient returns an unrecognized status
- while DHCP_DDNS was removing a reverse address mapping.  The request will be
- aborted.  This is most likely a programmatic issue and should be reported.
+ % DHCP_DDNS_SHUTDOWN application received shutdown command with args: %1
+ This is informational message issued when the application has been instructed
+ to shut down by the controller.
  
- % DHCP_DDNS_REMOVE_SUCCEEDED DHCP_DDNS successfully removed the DNS mapping addition for this request: %1
- This is an informational message issued after DHCP_DDNS has submitted DNS
- mapping removals which were received and accepted by an appropriate DNS server.
+ % DHCP_DDNS_STARTING_TRANSACTION Transaction Key: %1
++This is a debug message issued when DHCP-DDNS has begun a transaction for 
++a given request.
  
- % DHCP_DDNS_REMOVE_FAILED DHCP_DDNS Transaction outcome: %1
- This is an error message issued after DHCP_DDNS attempts to submit DNS mapping
- entry removals have failed.  The precise reason for the failure should be
- documented in preceding log entries.
+ % DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR application encountered an unexpected error while carrying out a NameChangeRequest: %1
+ This is error message issued when the application fails to process a
+ NameChangeRequest correctly. Some or all of the DNS updates requested as part
+ of this update did not succeed. This is a programmatic error and should be
+ reported.
  
- % DHCP_DDNS_STARTING_TRANSACTION Transaction Key: %1
+ % DHCP_DDNS_TRANS_SEND_ERROR application encountered an unexpected error while attempting to send a DNS update: %1
+ This is error message issued when the application is able to construct an update
+ message but the attempt to send it suffered a unexpected error. This is most
+ likely a programmatic error, rather than a communications issue. Some or all
+ of the DNS updates requested as part of this request did not succeed.
  
 -% DHCP_DDNS_UPDATE_REQUEST_SENT for transaction key: %1 to server: %2
 +% DHCP_DDNS_UPDATE_REQUEST_SENT %1 for transaction key: %2 to server: %3
  This is a debug message issued when DHCP_DDNS sends a DNS request to a DNS
  server.
  

diff --cc src/bin/d2/tests/d2_cfg_mgr_unittests.cc
Simple merge