Parcourir la source

[2326] Modification of the text of some error messages

Stephen Morris il y a 12 ans
Parent
commit
34cb2bf922
1 fichiers modifiés avec 26 ajouts et 24 suppressions
  1. 26 24
      src/bin/dhcp6/dhcp6_messages.mes

+ 26 - 24
src/bin/dhcp6/dhcp6_messages.mes

@@ -65,12 +65,12 @@ This informational message is printed every time DHCPv6 is started.
 It indicates what database backend type is being to store lease and
 other information.
 
-% DHCP6_DB_ERROR_LEASE6_WITHOUT_DUID database error: DB returns a lease for address %1 without any DUID
-This error message indicates database consistency failure. Database has an entry
-for a given address and believes it is currently used, but it does not
-contain client-id information. This is most likely a software error.
-Please contact ISC. As a temporary workaround, please manually remove
-lease entry from the database.
+% DHCP6_DB_ERROR_LEASE6_WITHOUT_DUID lease for address %1 does not have a DUID
+This error message indicates a database consistency failure. The lease
+database has an entry indicating that the given address is in use,
+but the lease does not contain any client identification. This is most
+likely due to a software error: please raise a bug report. As a temporary
+workaround, manually remove the lease entry from the database.
 
 % DHCP6_LEASE_ADVERT lease %1 advertised (client duid=%2, iaid=%3)
 This debug message indicates that the server successfully advertised
@@ -93,26 +93,28 @@ This message indicates that the server failed to grant (in response to
 received REQUEST) a lease for a given client. There may be many reasons for
 such failure. Each specific failure is logged in a separate log entry.
 
-% DHCP6_RELEASE Address %1 belonging to client duid=%2, iaid=%3 was released properly.
-This debug message indicates that an address was released properly. This
+% DHCP6_RELEASE address %1 belonging to client duid=%2, iaid=%3 was released properly.
+This debug message indicates that an address was released properly. It
 is a normal operation during client shutdown.
 
-% DHCP6_RELEASE_FAIL Database failed to remove lease for address %1 for duid=%2, iaid=%3
-This error message incidates that database failed to release a lease.
-This indicates a database operation error and likely requires administrator
-intervention (e.g. check if DHCP process has sufficient priviledges to update
-database).
-
-% DHCP6_RELEASE_FAIL_WRONG_DUID Client (duid=%2) tried to release address %2, but it belongs to client (duid=%3)
-This warning message indicates that client tried to release an address that
-does belong to a different client. This should not happen in normal circumstances,
-but since the client is releasing it will stop using released addresses anyway,
-so 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)
-This warning message indicates that client tried to release an address that
-does belong to it, but was expected in a different IA container. This likely
-means that the client's support for multiple address is buggy.
+% DHCP6_RELEASE_FAIL failed to remove lease for address %1 for duid=%2, iaid=%3
+This error message indicates that the software failed to remove a
+lease from the lease database.  It indicates a database operation error:
+resolution will most likely require administrator intervention (e.g. check
+if DHCP process has sufficient privileges to update the database).
+
+% DHCP6_RELEASE_FAIL_WRONG_DUID client (duid=%2) 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)
+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
+support for multiple addresses is flawed.
 
 % DHCP6_REQUIRED_OPTIONS_CHECK_FAIL %1 message received from %2 failed the following check: %3
 This message indicates that received DHCPv6 packet is invalid.  This may be due