1.1 --- a/INSTALL	Mon Jun 21 09:40:16 2010 +0200
     1.2 +++ b/INSTALL	Mon Jun 21 10:04:36 2010 +0200
     1.3 @@ -178,15 +178,19 @@
     1.4  possibilities:
     1.5  
     1.6  * if you are using the masqdialer system, you just have to set the
     1.7 -  variables online_detect to mserver and mserver_iface to the interface
     1.8 -  mserver is listening to.
     1.9 +  variables online_detect to pipe and online_pipe to something like
    1.10 +	/usr/bin/mservdetect localhost 222
    1.11 +  if mserver is running on localhost and listens on port 222. See the
    1.12 +  man page to mservdetect(1).
    1.13 +
    1.14  * otherwise you have to add two commands in your ip-up script:
    1.15 -	echo -n $6 > /tmp/connect_route
    1.16 -	chmod 644 /tmp/connect_route
    1.17 -  and you have to remove the file /tmp/connect_route in your ip-down script:
    1.18 -	rm /tmp/connect_route.
    1.19 +	echo "$6" >/var/run/masqmail/masqmail-route
    1.20 +	chmod 644 /var/run/masqmail/masqmail-route
    1.21 +  and you have to remove the file /var/run/masqmail/masqmail-route in
    1.22 +  your ip-down script:
    1.23 +	rm /var/run/masqmail/masqmail-route
    1.24    Then you have to set online_detect to file and online_file to
    1.25 -  /tmp/connect_route.
    1.26 +  /var/run/masqmail/masqmail-route
    1.27  
    1.28  See the route documentation for more.
    1.29  

     2.1 --- a/man/masqmail.conf.5	Mon Jun 21 09:40:16 2010 +0200
     2.2 +++ b/man/masqmail.conf.5	Mon Jun 21 10:04:36 2010 +0200
     2.3 @@ -349,6 +349,8 @@
     2.4  When it is set to \fBmserver\fR, masqmail connects to the masqdialer server
     2.5  using the value of \fBmserver_iface\fR and asks it whether a connection exists and for the name,
     2.6  which should be the name of the current connection as defined with \fBconnect_route.\fIname\fR.
     2.7 +\fBThe mserver detection method is OBSOLETE.\fR
     2.8 +See mserver_iface for a note on how to replace it.
     2.9  
    2.10  No matter how masqmail detects the online status,
    2.11  only messages that are accepted at online time will be delivered using the connection.
    2.12 @@ -361,7 +363,7 @@
    2.13  The file should only exist when there is currently a connection.
    2.14  Create it in your ip-up script with e.g.
    2.15  
    2.16 -echo \-n <name> > /var/run/masqmail/masqmail-route
    2.17 +echo "connection-name" >/var/run/masqmail/masqmail-route
    2.18  
    2.19  chmod 0644 /var/run/masqmail/masqmail-route
    2.20  
    2.21 @@ -390,6 +392,14 @@
    2.22  .TP
    2.23  \fBmserver_iface = \fIinterface\fR
    2.24  
    2.25 +\fBThis option is OBSOLETE\fP, use
    2.26 +
    2.27 +online_method=pipe
    2.28 +
    2.29 +online_pipe="/usr/bin/mservdetect localhost 222"
    2.30 +
    2.31 +instead.
    2.32 +
    2.33  The interface the masqdialer server is listening to.
    2.34  Usually this will be "localhost:224" if mserver is running on the same host as masqmail.
    2.35  But using this option, you can also let masqmail run on another host by setting