Browse Source

[kea-0.9.1-release] reorder message files

Wlodek Wencel 10 years ago
parent
commit
efa404b7de
2 changed files with 10 additions and 10 deletions
  1. 4 4
      src/bin/dhcp4/dhcp4_messages.mes
  2. 6 6
      src/lib/dhcpsrv/dhcpsrv_messages.mes

+ 4 - 4
src/bin/dhcp4/dhcp4_messages.mes

@@ -74,10 +74,6 @@ change is committed by the administrator.
 A debug message indicating that the DHCPv4 server has received an
 A debug message indicating that the DHCPv4 server has received an
 updated configuration from the Kea configuration system.
 updated configuration from the Kea configuration system.
 
 
-% DHCP4_DISCOVER_CLASS_PROCESSING_FAILED client class specific processing failed for DHCPDISCOVER
-This debug message means that the server processing that is unique for each
-client class has reported a failure. The response packet will not be sent.
-
 % DHCP4_DDNS_REQUEST_SEND_FAILED failed sending a request to kea-dhcp-ddns, error: %1,  ncr: %2
 % DHCP4_DDNS_REQUEST_SEND_FAILED failed sending a request to kea-dhcp-ddns, error: %1,  ncr: %2
 This error message indicates that DHCP4 server attempted to send a DDNS
 This error message indicates that DHCP4 server attempted to send a DDNS
 update request to the DHCP-DDNS server.  This is most likely a configuration or
 update request to the DHCP-DDNS server.  This is most likely a configuration or
@@ -93,6 +89,10 @@ This error message is logged when the attempt to compute DHCID for a specified
 lease has failed. The lease details and reason for failure is logged in the
 lease has failed. The lease details and reason for failure is logged in the
 message.
 message.
 
 
+% DHCP4_DISCOVER_CLASS_PROCESSING_FAILED client class specific processing failed for DHCPDISCOVER
+This debug message means that the server processing that is unique for each
+client class has reported a failure. The response packet will not be sent.
+
 % DHCP4_DYNAMIC_RECONFIGURATION initiate server reconfiguration using file: %1, after receiving SIGHUP signal
 % DHCP4_DYNAMIC_RECONFIGURATION initiate server reconfiguration using file: %1, after receiving SIGHUP signal
 This is the info message logged when the DHCPv4 server starts reconfiguration
 This is the info message logged when the DHCPv4 server starts reconfiguration
 as a result of receiving SIGHUP signal.
 as a result of receiving SIGHUP signal.

+ 6 - 6
src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -179,12 +179,6 @@ the database access parameters are changed: in the latter case, the
 server closes the currently open database, and opens a database using
 server closes the currently open database, and opens a database using
 the new parameters.
 the new parameters.
 
 
-% DHCPSRV_DISCOVER_ADDRESS_CONFLICT conflicting reservation for address %1 with existing lease %2
-This warning message is issued when the DHCP server finds that the
-address reserved for the client can't be offered because this address
-is currently allocated to another client. The server will try to allocate
-a different address to the client to use until the conflict is resolved.
-
 % DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION error handler for DHCP_DDNS IO generated an expected exception: %1
 % DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION error handler for DHCP_DDNS IO generated an expected exception: %1
 This is an error message that occurs when an attempt to send a request to
 This is an error message that occurs when an attempt to send a request to
 kea-dhcp-ddns fails there registered error handler threw an uncaught exception.
 kea-dhcp-ddns fails there registered error handler threw an uncaught exception.
@@ -222,6 +216,12 @@ have been experienced.  Any such errors should have preceding entries in the
 log with details.  No further attempts to communicate with kea-dhcp-ddns will
 log with details.  No further attempts to communicate with kea-dhcp-ddns will
 be made without intervention.
 be made without intervention.
 
 
+% DHCPSRV_DISCOVER_ADDRESS_CONFLICT conflicting reservation for address %1 with existing lease %2
+This warning message is issued when the DHCP server finds that the
+address reserved for the client can't be offered because this address
+is currently allocated to another client. The server will try to allocate
+a different address to the client to use until the conflict is resolved.
+
 % DHCPSRV_HOOK_LEASE4_RENEW_SKIP DHCPv4 lease was not renewed because a callout set the skip flag.
 % DHCPSRV_HOOK_LEASE4_RENEW_SKIP DHCPv4 lease was not renewed because a callout set the skip flag.
 This debug message is printed when a callout installed on lease4_renew
 This debug message is printed when a callout installed on lease4_renew
 hook point set the skip flag. For this particular hook point, the setting
 hook point set the skip flag. For this particular hook point, the setting