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

Merge pull request #2505 from torstehu/fix-typo4

Browse source 
Fix typos and a small build fix
This commit is contained in:
Lennart Poettering 2016-02-01 22:09:54 +01:00
parent fd04bba0e8 fa9e9f72b9
commit b72190e90f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
man/systemd-resolve.xml
View file

@ -179,7 +179,7 @@
<varlistentry>
<term><option>--service</option></term>
<listitem><para>Enables service resolution. This enables DNS-SD and simple SRV service resolution, dependending
<listitem><para>Enables service resolution. This enables DNS-SD and simple SRV service resolution, depending
on the specified list of parameters (see above).</para></listitem>
</varlistentry>

2
src/resolve/resolved-dns-transaction.c
View file

@ -1538,7 +1538,7 @@ int dns_transaction_go(DnsTransaction *t) {
return 0;
}
if (t->scope->protocol == DNS_PROTOCOL_LLMNR && ERRNO_IS_DISCONNECT(-r)) {
/* On LLMNR, if we cannot connect to a host via TCP when doing revers lookups. This means we cannot
/* On LLMNR, if we cannot connect to a host via TCP when doing reverse lookups. This means we cannot
* answer this request with this protocol. */
dns_transaction_complete(t, DNS_TRANSACTION_NOT_FOUND);
return 0;

2
src/resolve/test-dnssec-complex.c
View file

@ -220,7 +220,7 @@ int main(int argc, char* argv[]) {
test_hostname_lookup(bus, "poettering.de", AF_INET, NULL);
test_hostname_lookup(bus, "poettering.de", AF_INET6, NULL);
#if HAVE_LIBIDN
#ifdef HAVE_LIBIDN
/* Unsigned A with IDNA conversion necessary */
test_hostname_lookup(bus, "pöttering.de", AF_UNSPEC, NULL);
test_hostname_lookup(bus, "pöttering.de", AF_INET, NULL);