diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-21 21:48:16 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-21 21:48:16 +0000 |
| commit | 04bec6757494a7ac3a798bde068abf151c8a8242 (patch) | |
| tree | cf7decc1b32538de5585d53a618aaba34cc0b492 /doc | |
| parent | 083e9c2b59614bd5dae78d5db2473ddbca9cb8c4 (diff) | |
| download | tor-04bec6757494a7ac3a798bde068abf151c8a8242.tar.gz tor-04bec6757494a7ac3a798bde068abf151c8a8242.zip | |
r8874@Kushana: nickm | 2006-09-21 15:22:27 -0400
Rename and document SearchDomains and ResolvConf options; warn if ServerDNSResolvConfFile is given but eventdns isnt enabled.
svn:r8439
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/TODO | 2 | ||||
| -rw-r--r-- | doc/tor.1.in | 17 |
2 files changed, 18 insertions, 1 deletions
@@ -92,7 +92,7 @@ N - DNS improvements d - Autodetect whether DNS is broken in this way. - Don't ask reject *:* nodes for DNS unless client wants you to. . Asynchronous DNS - - Document SearchDomains, ResolvConf options + o Document and rename SearchDomains, ResolvConf options D Make API closer to getaddrinfo() - Teach it to be able to listen for A and PTR requests to be processed. Interface should be set_request_listener(sock, cb); [ cb(request) ] diff --git a/doc/tor.1.in b/doc/tor.1.in index 8cbb69b50e..a162137c62 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -630,6 +630,23 @@ as day 1 and Sunday as day 7. If \fBday\fR is given, each accounting period runs from the time \fIHH:MM\fR each day to the same time on the next day. All times are local, and given in 24-hour time. (Defaults to "month 1 0:00".) +.LP +.TP +\fBServerDNSResolvConfFile \fR\fIfilename\fP +Overrides the default DNS configuration with the configuration in +\fIfilename\fP. The file format is the same as the standard Unix +"\fBresolv.conf\fP" file (7). This option only effects name lookup for +addresses requested by clients; and only takes effect if Tor was built with +eventdns support. (Defaults to use the system DNS configuration.) +.LP +.TP +\fBServerDNSSearchDomains \fR\fB0\fR|\fB1\fR\fP +If set to \fB1\fP, then we will search for addresses in the local search +domain. For example, if this system is configured to believe it is in +"example.com", and a client tries to connect to "www", the client will be +connected to "www.example.com". +This option only effects name lookup for addresses requested by clients. +(Defaults to "0".) .SH DIRECTORY SERVER OPTIONS .PP |