r13267@catbus: nickm | 2007-06-05 16:54:20 -0400

 Man page and small tweaks for last patch.


svn:r10505

doc/tor.1.in

@@ -121,6 +121,11 @@ This directive can be specified multiple times to bind to multiple
 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

src/or/or.h

@@ -1831,8 +1831,8 @@ typedef struct {
   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. */