1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00

Merge pull request #3746 from keszybz/trivial-fixes

Trivial fixes
This commit is contained in:
Daniel Mack 2016-07-18 09:54:06 +02:00 committed by GitHub
commit d909beef0a
5 changed files with 10 additions and 11 deletions

View File

@ -68,8 +68,8 @@
link-local networking).</para></listitem>
<listitem><para>The glibc
<citerefentry><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API (as defined
by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink>) and its related resolver functions,
<citerefentry><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined
by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,
including <citerefentry><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC
validation status information however, and is synchronous only. This API is backed by the glibc Name Service

View File

@ -651,7 +651,7 @@
It is used as mark-configured SAD/SPD entry as part of the lookup key (both in data
and control path) in ip xfrm (framework used to implement IPsec protocol).
See <ulink url="http://man7.org/linux/man-pages/man8/ip-xfrm.8.html">
ip-xfrm - transform configuration</ulink> for details. It is only used for VTI/VTI6
ip-xfrm transform configuration</ulink> for details. It is only used for VTI/VTI6
tunnels.</para>
</listitem>
</varlistentry>

View File

@ -88,7 +88,7 @@
configured dependencies of type <varname>Wants=</varname> or
<varname>Requires=</varname> with dependencies of type
<varname>After=</varname>. Note that <varname>Wants=</varname> or
<varname>Requires=</varname> must be defined in the target unit itself - if
<varname>Requires=</varname> must be defined in the target unit itself if
you for example define <varname>Wants=</varname>some.target in
some.service, the implicit ordering will not be added.</para>

View File

@ -803,9 +803,8 @@ char **strv_reverse(char **l) {
if (n <= 1)
return l;
for (i = 0; i < n / 2; i++) {
for (i = 0; i < n / 2; i++)
SWAP_TWO(l[i], l[n-1-i]);
}
return l;
}

View File

@ -1229,8 +1229,8 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt
yes_no(link_info.dnssec_supported));
STRV_FOREACH(i, link_info.dns) {
printf(" %s %s\n",
i == link_info.dns ? "DNS Server:" : " ",
printf(" %s %s\n",
i == link_info.dns ? "DNS Servers:" : " ",
*i);
}
@ -1412,8 +1412,8 @@ static int status_global(sd_bus *bus, bool *empty_line) {
printf("%sGlobal%s\n", ansi_highlight(), ansi_normal());
STRV_FOREACH(i, global_info.dns) {
printf(" %s %s\n",
i == global_info.dns ? "DNS Server:" : " ",
printf(" %s %s\n",
i == global_info.dns ? "DNS Servers:" : " ",
*i);
}
@ -1446,7 +1446,7 @@ static int status_all(sd_bus *bus) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
sd_netlink_message *i;
bool empty_line = true;
bool empty_line = false;
int r;
assert(bus);