picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

treewide: correct typos and use consistent "MAC" spelling

This commit is contained in:
Torstein Husebø 2015-02-09 14:18:57 +01:00 committed by Martin Pitt
parent c8f5edeab0
commit e2acdb6b0f
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd.link.xml
View File

@ -218,7 +218,7 @@
boot for the given machine and the given device, but boot for the given machine and the given device, but
which is otherwise random. This feature depends on ID_NET_NAME_* which is otherwise random. This feature depends on ID_NET_NAME_*
properties existing for the link, on hardware where these properties existing for the link, on hardware where these
properties are not set the generation of a persistent mac address properties are not set the generation of a persistent MAC address
will fail.</para> will fail.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
man/systemd.unit.xml
View File

@ -1362,7 +1362,7 @@ WantedBy=multi-user.target</programlisting>
<para>Now one wants to change some settings as an administrator: <para>Now one wants to change some settings as an administrator:
firstly, in the local setup, <filename>/srv/webserver</filename> firstly, in the local setup, <filename>/srv/webserver</filename>
might not exit, because the HTTP server is configured to use might not exist, because the HTTP server is configured to use
<filename>/srv/www</filename> instead. Secondly, the local <filename>/srv/www</filename> instead. Secondly, the local
configuration makes the HTTP server also depend on a memory configuration makes the HTTP server also depend on a memory
cache service, <filename>memcached.service</filename>, that cache service, <filename>memcached.service</filename>, that

2
src/libsystemd-network/dhcp-identifier.c
View File

@ -90,7 +90,7 @@ int dhcp_identifier_set_iaid(int ifindex, uint8_t *mac, size_t mac_len, uint32_t
if (name) if (name)
siphash24((uint8_t*)&id, name, strlen(name), HASH_KEY.bytes); siphash24((uint8_t*)&id, name, strlen(name), HASH_KEY.bytes);
else else
/* fall back to mac address if no predictable name available */ /* fall back to MAC address if no predictable name available */
siphash24((uint8_t*)&id, mac, mac_len, HASH_KEY.bytes); siphash24((uint8_t*)&id, mac, mac_len, HASH_KEY.bytes);
/* fold into 32 bits */ /* fold into 32 bits */

2
src/libsystemd-network/dhcp-network.c
View File

@ -63,7 +63,7 @@ static int _bind_raw_socket(int ifindex, union sockaddr_union *link,
BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.htype)), /* A <- DHCP header type */ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.htype)), /* A <- DHCP header type */
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, arp_type, 1, 0), /* header type == arp_type ? */ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, arp_type, 1, 0), /* header type == arp_type ? */
BPF_STMT(BPF_RET + BPF_K, 0), /* ignore */ BPF_STMT(BPF_RET + BPF_K, 0), /* ignore */
BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.hlen)), /* A <- mac address length */ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.hlen)), /* A <- MAC address length */
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, dhcp_hlen, 1, 0), /* address length == dhcp_hlen ? */ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, dhcp_hlen, 1, 0), /* address length == dhcp_hlen ? */
BPF_STMT(BPF_RET + BPF_K, 0), /* ignore */ BPF_STMT(BPF_RET + BPF_K, 0), /* ignore */
BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(DHCPPacket, dhcp.xid)), /* A <- client identifier */ BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(DHCPPacket, dhcp.xid)), /* A <- client identifier */

2
src/libsystemd-network/sd-dhcp-server.c
View File

@ -597,7 +597,7 @@ static int ensure_sane_request(DHCPRequest *req, DHCPMessage *message) {
req->message = message; req->message = message;
/* set client id based on mac address if client did not send an explicit /* set client id based on MAC address if client did not send an explicit
one */ one */
if (!req->client_id.data) { if (!req->client_id.data) {
uint8_t *data; uint8_t *data;

2
src/network/networkd-link.c
View File

@ -1133,7 +1133,7 @@ static int link_up(Link *link) {
r = sd_rtnl_message_close_container(req); r = sd_rtnl_message_close_container(req);
if (r < 0) { if (r < 0) {
log_link_error(link, "Could not close IFLA_AF_SPEC contaire: %s", strerror(-r)); log_link_error(link, "Could not close IFLA_AF_SPEC container: %s", strerror(-r));
return r; return r;
} }

4
src/network/networkd-network.c
View File

@ -680,12 +680,12 @@ int config_parse_token(
r = in_addr_is_null(AF_INET6, &buffer); r = in_addr_is_null(AF_INET6, &buffer);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token canno t be the ANY address, ignoring: %s", rvalue); log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token can not be the ANY address, ignoring: %s", rvalue);
return 0; return 0;
} }
if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) { if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token canno t be longer than 64 bits, ignoring: %s", rvalue); log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token can not be longer than 64 bits, ignoring: %s", rvalue);
return 0; return 0;
} }