[master] reordering *.mes files

src/bin/dhcp4/dhcp4_messages.mes

@@ -158,10 +158,6 @@ This debug message is issued when the client being in the INIT-REBOOT state
 requested an address which is not assigned to him. The server will respond
 to this client with DHCPNAK.
 
-% DHCP4_NO_LEASE_INIT_REBOOT no lease for address %1 requested by INIT-REBOOT client (id: %2, hwaddr: %3)
-This debug message is issued when the client being in the INIT-REBOOT state
-requested an address but this client is unknown. The server will not respond.
-
 % DHCP4_INVALID_RELAY_INFO malformed packet received from client-id %1, hwaddr %2: %3
 This message is logged when the client sends invalid combination of
 values in the giaddr and hops fields. If the packet is relayed it should
@@ -215,6 +211,10 @@ message.
 A warning message is issued when an attempt is made to shut down the
 DHCPv4 server but it is not running.
 
+% DHCP4_NO_LEASE_INIT_REBOOT no lease for address %1 requested by INIT-REBOOT client (id: %2, hwaddr: %3)
+This debug message is issued when the client being in the INIT-REBOOT state
+requested an address but this client is unknown. The server will not respond.
+
 % DHCP4_NO_SOCKETS_OPEN no interface configured to listen to DHCP traffic
 This warning message is issued when current server configuration specifies
 no interfaces that server should listen on, or specified interfaces are not

src/bin/lfc/lfc_messages.mes

@@ -13,29 +13,14 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 $NAMESPACE isc::lfc
-% LFC_START Starting lease file cleanup
-This message is issued as the LFC process starts.
-
-% LFC_TERMINATE LFC finished processing
-This message is issued when the LFC process completes.  It does not
-indicate that the process was successful only that it has finished.
-
-% LFC_RUNNING LFC instance already running
-This message is issued if LFC detects that a previous copy of LFC
-may still be running via the PID check.
-
-% LFC_PROCESSING Previous file: %1, copy file: %2
-This message is issued just before LFC starts processing the 
-lease files.
-
-% LFC_ROTATING LFC rotating files
-This message is issued just before LFC starts rotating the
-lease files - removing the old and replacing them with the new.
-
 % LFC_FAIL_PID_CREATE : %1
 This message is issued if LFC detected a failure when trying
 to create the PID file.  It includes a more specifc error string.
 
+% LFC_FAIL_PID_DEL : %1
+This message is issued if LFC detected a failure when trying
+to delete the PID file.  It includes a more specifc error string.
+
 % LFC_FAIL_PROCESS : %1
 This message is issued if LFC detected a failure when trying
 to process the files.  It includes a more specifc error string.
@@ -44,17 +29,31 @@ to process the files.  It includes a more specifc error string.
 This message is issued if LFC detected a failure when trying
 to rotate the files.  It includes a more specifc error string.
 
-% LFC_FAIL_PID_DEL : %1
-This message is issued if LFC detected a failure when trying
-to delete the PID file.  It includes a more specifc error string.
+% LFC_PROCESSING Previous file: %1, copy file: %2
+This message is issued just before LFC starts processing the
+lease files.
 
 % LFC_READ_STATS Leases: %1, attempts: %2, errors: %3.
 This message prints out the number of leases that were read, the
 number of attempts to read leases and the number of errors
 encountered while reading.
 
+% LFC_ROTATING LFC rotating files
+This message is issued just before LFC starts rotating the
+lease files - removing the old and replacing them with the new.
+
+% LFC_RUNNING LFC instance already running
+This message is issued if LFC detects that a previous copy of LFC
+may still be running via the PID check.
+
+% LFC_START Starting lease file cleanup
+This message is issued as the LFC process starts.
+
+% LFC_TERMINATE LFC finished processing
+This message is issued when the LFC process completes.  It does not
+indicate that the process was successful only that it has finished.
+
 % LFC_WRITE_STATS Leases: %1, attempts: %2, errors: %3.
 This message prints out the number of leases that were written, the
 number of attempts to write leases and the number of errors
 encountered while writing.
-

src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -79,13 +79,6 @@ of active interfaces. This doesn't prevent the server from listening to
 the DHCP traffic through open sockets, but will rather be used by Interface
 Manager to select active interfaces when sockets are re-opened.
 
-% DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE current configuration will result in opening multiple brodcast capable sockets on some interfaces and some DHCP messages may be duplicated
-A warning message issued when the current configuration indicates that multiple
-sockets, capable of receiving brodcast traffic, will be opened on some of the
-interfaces. It must be noted that this may lead to receiving and processing
-the same DHCP message multiple times, as it will be received by each socket
-individually.
-
 % DHCPSRV_CFGMGR_NO_SUBNET4 no suitable subnet is defined for address hint %1
 This debug message is output when the DHCP configuration manager has received
 a request for an IPv4 subnet for the specified address, but no such
@@ -106,11 +99,6 @@ This is a debug message reporting that the DHCP configuration manager has
 returned the specified IPv6 subnet when given the address hint specified
 because it is the only subnet defined.
 
-% DHCPSRV_CFGMGR_SOCKET_TYPE_DEFAULT "dhcp-socket-type" not specified , using default socket type %1
-This informational message is logged when the administrator hasn't
-specified the "dhcp-socket-type" parameter in configuration for interfaces.
-In such case, the default socket type will be used.
-
 % DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED use of raw sockets is unsupported on this OS, UDP sockets will be used
 This warning message is logged when the user specified that the
 DHCPv4 server should use the raw sockets to receive the DHCP
@@ -123,6 +111,11 @@ back to use of the IP/UDP sockets. The responses to
 the directly connected clients will be broadcast. The responses
 to relayed clients will be unicast as usual.
 
+% DHCPSRV_CFGMGR_SOCKET_TYPE_DEFAULT "dhcp-socket-type" not specified , using default socket type %1
+This informational message is logged when the administrator hasn't
+specified the "dhcp-socket-type" parameter in configuration for interfaces.
+In such case, the default socket type will be used.
+
 % DHCPSRV_CFGMGR_SOCKET_TYPE_SELECT using socket type %1
 This informational message is logged when the DHCPv4 server selects the
 socket type to be used for all sockets that will be opened on the
@@ -359,6 +352,10 @@ replaced by those read from the file.
 % DHCPSRV_MEMFILE_LEASE_LOAD loading lease %1
 A debug message issued when DHCP lease is being loaded from the file to memory.
 
+% DHCPSRV_MEMFILE_LFC_EXECUTE executing Lease File Cleanup using: %1
+An informational message issued when the Memfile lease database backend
+starts a new process to perform Lease File Cleanup.
+
 % DHCPSRV_MEMFILE_LFC_LEASE_FILE_RENAME_FAIL failed to rename the current lease file %1 to %2, reason: %3
 An error message logged when the Memfile lease database backend fails to
 move the current lease file to a new file on which the cleanup should
@@ -388,10 +385,6 @@ failure persist however, the size of the lease file will increase without bound.
 An informational message issued when the Memfile lease database backend
 starts the periodic Lease File Cleanup.
 
-% DHCPSRV_MEMFILE_LFC_EXECUTE executing Lease File Cleanup using: %1
-An informational message issued when the Memfile lease database backend
-starts a new process to perform Lease File Cleanup.
-
 % DHCPSRV_MEMFILE_NO_STORAGE running in non-persistent mode, leases will be lost after restart
 A warning message issued when writes of leases to disk have been disabled
 in the configuration. This mode is useful for some kinds of performance
@@ -417,6 +410,13 @@ lease from the memory file database for the specified address.
 A debug message issued when the server is attempting to update IPv6
 lease from the memory file database for the specified address.
 
+% DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE current configuration will result in opening multiple brodcast capable sockets on some interfaces and some DHCP messages may be duplicated
+A warning message issued when the current configuration indicates that multiple
+sockets, capable of receiving brodcast traffic, will be opened on some of the
+interfaces. It must be noted that this may lead to receiving and processing
+the same DHCP message multiple times, as it will be received by each socket
+individually.
+
 % DHCPSRV_MYSQL_ADD_ADDR4 adding IPv4 lease with address %1
 A debug message issued when the server is about to add an IPv4 lease
 with the specified address to the MySQL backend database.
@@ -494,17 +494,17 @@ lease from the MySQL database for the specified address.
 A debug message issued when the server is attempting to update IPv6
 lease from the MySQL database for the specified address.
 
-% DHCPSRV_NO_SOCKETS_OPEN no interface configured to listen to DHCP traffic
-This warning message is issued when the current server configuration specifies
-no interfaces that the server should listen on, or when the specified interfaces are not
-configured to receive the traffic.
-
 % DHCPSRV_NOTYPE_DB no 'type' keyword to determine database backend: %1
 This is an error message, logged when an attempt has been made to access
 a database backend, but where no 'type' keyword has been included in
 the access string.  The access string (less any passwords) is included
 in the message.
 
+% DHCPSRV_NO_SOCKETS_OPEN no interface configured to listen to DHCP traffic
+This warning message is issued when the current server configuration specifies
+no interfaces that the server should listen on, or when the specified interfaces are not
+configured to receive the traffic.
+
 % DHCPSRV_OPEN_SOCKET_FAIL failed to open socket: %1
 A warning message issued when IfaceMgr fails to open and bind a socket.
 The reason for the failure is appended as an argument of the log message.