[or-cvs] r10505: Man page and small tweaks for last patch. (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-05 16:54:53 -0400 (Tue, 05 Jun 2007)
New Revision: 10505

Modified:
   tor/trunk/
   tor/trunk/doc/tor.1.in
   tor/trunk/src/or/or.h
Log:
 r13267 at catbus:  nickm | 2007-06-05 16:54:20 -0400
 Man page and small tweaks for last patch.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13267] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/tor.1.in
===================================================================
--- tor/trunk/doc/tor.1.in	2007-06-05 20:54:49 UTC (rev 10504)
+++ tor/trunk/doc/tor.1.in	2007-06-05 20:54:53 UTC (rev 10505)
@@ -121,6 +121,11 @@
 addresses/ports.
 .LP
 .TP
+\fBControlSocket \fR\fIPath\fP
+Like ControlPort, but listens on a Unix domain socket, rather than a TCP
+socket.  (Unix and Unix-like systems only.)
+.LP
+.TP
 \fBHashedControlPassword \fR\fIhashed_password\fP
 Don't allow any connections on the control port except when the other process
 knows the password whose one-way hash is \fIhashed_password\fP.  You can

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-06-05 20:54:49 UTC (rev 10504)
+++ tor/trunk/src/or/or.h	2007-06-05 20:54:53 UTC (rev 10505)
@@ -1831,8 +1831,8 @@
   int TransPort;
   int NatdPort; /**< Port to listen on for transparent natd connections. */
   int ControlPort; /**< Port to listen on for control connections. */
-  config_line_t * ControlSocket; /**< Unix Domain Socket to listen on
-                                  * for control connections. */
+  config_line_t *ControlSocket; /**< List of Unix Domain Sockets to listen on
+                                 * for control connections. */
   int DirPort; /**< Port to listen on for directory connections. */
   int DNSPort; /**< Port to listen on for DNS requests. */
   int AssumeReachable; /**< Whether to publish our descriptor regardless. */