|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
From 6ff8806e1d20a4d3cbc4b360326ea3786768f0ca Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
Date: Fri, 29 Aug 2014 13:28:04 +0200
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
Subject: [PATCH] Fix a few typos in log messages
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
src/libsystemd-network/sd-dhcp-client.c | 12 ++++++------
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
src/libsystemd/sd-rtnl/sd-rtnl.c | 2 +-
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
index 7cf1b80d29..2f94c16078 100644
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
--- a/src/libsystemd-network/sd-dhcp-client.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+++ b/src/libsystemd-network/sd-dhcp-client.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -919,7 +919,7 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
r = dhcp_option_parse(offer, len, dhcp_lease_parse_options, lease);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (r != DHCP_OFFER) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- log_dhcp_client(client, "receieved message was not an OFFER, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ log_dhcp_client(client, "received message was not an OFFER, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return -ENOMSG;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
}
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -930,7 +930,7 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (lease->address == INADDR_ANY ||
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
lease->server_address == INADDR_ANY ||
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
lease->lifetime == 0) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- log_dhcp_client(client, "receieved lease lacks address, server "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ log_dhcp_client(client, "received lease lacks address, server "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
"address or lease lifetime, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return -ENOMSG;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
}
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -938,7 +938,7 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (lease->subnet_mask == INADDR_ANY) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
r = dhcp_lease_set_default_subnet_mask(lease);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (r < 0) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- log_dhcp_client(client, "receieved lease lacks subnet "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ log_dhcp_client(client, "received lease lacks subnet "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
"mask, and a fallback one can not be "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
"generated, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return -ENOMSG;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -983,7 +983,7 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
}
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (r != DHCP_ACK) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- log_dhcp_client(client, "receieved message was not an ACK, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ log_dhcp_client(client, "received message was not an ACK, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return -ENOMSG;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
}
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -994,7 +994,7 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (lease->address == INADDR_ANY ||
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
lease->server_address == INADDR_ANY ||
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
lease->lifetime == 0) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- log_dhcp_client(client, "receieved lease lacks address, server "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ log_dhcp_client(client, "received lease lacks address, server "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
"address or lease lifetime, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return -ENOMSG;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
}
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -1002,7 +1002,7 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (lease->subnet_mask == INADDR_ANY) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
r = dhcp_lease_set_default_subnet_mask(lease);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (r < 0) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- log_dhcp_client(client, "receieved lease lacks subnet "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ log_dhcp_client(client, "received lease lacks subnet "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
"mask, and a fallback one can not be "
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
"generated, ignoring");
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return -ENOMSG;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
index f883f2842c..a3f314b95b 100644
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -680,7 +680,7 @@ int sd_rtnl_call(sd_rtnl *rtnl,
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (r < 0)
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
return r;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (r > 0)
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- /* receieved message, so try to process straight away */
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+ /* received message, so try to process straight away */
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
continue;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
if (timeout > 0) {
|