From e895b358db8863d19dfa3d77c861ae19b76bc750 Mon Sep 17 00:00:00 2001 From: Mesar Hameed Date: Tue, 24 Jul 2012 07:18:50 +0100 Subject: [PATCH 1/2] Minor clarification, tinc.conf hostnames=[yes|no] variable only resolves names for logging purposes. --- doc/tinc.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tinc.texi b/doc/tinc.texi index 5cff2a66..cd972dec 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -944,7 +944,7 @@ tinc's efficiency, even stopping the daemon for a few seconds everytime it does a lookup if your DNS server is not responding. This does not affect resolving hostnames to IP addresses from the -configuration file. +configuration file, but whether hostnames should be resolved while logging. @cindex Interface @item Interface = <@var{interface}> From 3391018efbd41858d42ccae6ae919749ba94c8db Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 27 Jul 2012 22:43:01 +0200 Subject: [PATCH 2/2] Also clarify hostnames=[yes|no] in tinc.conf(5). --- THANKS | 1 + doc/tinc.conf.5.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/THANKS b/THANKS index 10eaca61..9c02e933 100644 --- a/THANKS +++ b/THANKS @@ -30,6 +30,7 @@ We would like to thank the following people for their contributions to tinc: * Matias Carrasco * Max Rijevski * Menno Smits +* Mesar Hameed * Michael Tokarev * Miles Nordin * Nick Hibma diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in index df74c5b1..fec70e61 100644 --- a/doc/tinc.conf.5.in +++ b/doc/tinc.conf.5.in @@ -340,7 +340,7 @@ a lookup if your DNS server is not responding. .Pp This does not affect resolving hostnames to IP addresses from the -host configuration files. +host configuration files, but whether hostnames should be resolved while logging. .It Va IffOneQueue Li = yes | no Po no Pc Bq experimental (Linux only) Set IFF_ONE_QUEUE flag on TUN/TAP devices.