Mercurial > masqmail

changeset 168:8630e37ae445

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author meillo@marmaro.de
date Tue, 13 Jul 2010 22:54:25 +0200
parents 0ef0f756280b (diff) 2ac8a66ee108 (current diff)
children c40bf27ddd93
files src/masqmail.c
diffstat 20 files changed, 359 insertions(+), 338 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 13 22:53:04 2010 +0200
+++ b/ChangeLog	Tue Jul 13 22:54:25 2010 +0200
@@ -7,6 +7,10 @@
 technical speach and with focus on compatibility.
 
 
+0.3.0   Thu, 08 Jul 2010 11:04:14 +0200
+	* started new development branch (Attention: it will not
+	  maintain backward compatibility!)
+
 0.2.25  Thu, 08 Jul 2010 00:49:36 +0200
 	* added server-side SMTP SIZE support. Thanks to Paolo.
 	* always remove Bcc: headers from now on
--- a/INSTALL	Tue Jul 13 22:53:04 2010 +0200
+++ b/INSTALL	Tue Jul 13 22:54:25 2010 +0200
@@ -5,18 +5,26 @@
 Installation instructions
 -------------------------
 
-To compile masqmail you need glib 1.2 (http://www.gtk.org).
+To compile masqmail you need glib (>= 1.2) (http://www.gtk.org). Your
+distribution probably provides it.
+
+You need a user and a group for masqmail to run. If
 
-You need a user and a group for masqmail to run, I suggest user
-'mail' and group 'trusted'. Say:
+	grep '^mail:' /etc/passwd
+	grep '^trusted:' /etc/group
+
+shows that the user `mail' and the group `trusted' exist, it's
+probably best to use these. If they don't exist, create them:
 
 	groupadd -g 42 trusted
-	useradd -u 42 -g 42 -d / -s /bin/sh -c "Mail Transfer Agent" mail
+	useradd -u 23 -g 42 -d / -s /bin/sh -c "Mail Transfer Agent" mail
 
-If you use other names than 'mail' and 'trusted' use the options
-described below for configure. The 42 is just a suggestion, you can
-use any number you like, but preferably one < 100. It does not have
-to be the same for the user 'mail' and the group 'trusted'.
+If you use other names than `mail' and `trusted' use the options
+described below for configure. The 23 and 42 are just a suggestion,
+you can use any (not yet used) number you like, but preferably one
+lower than 100. It does not have to be the same for the user `mail'
+and the group `trusted'.
+
 
 Compliling is a matter of the usual procedure. In the source directory,
 after unpacking do:
@@ -34,80 +42,88 @@
 
 	./configure -h
 
-Here is additional, but maybe obsolete, explanation:
+Here is a selection of the options with additional explanations:
 
---with-user=USER sets the user as which MasqMail will run. Default is
-'mail'. USER has to exist before you 'make install'.
+--with-user=USER
+sets the user as which masqmail will run. Default is 'mail'. USER has
+to exist before you 'make install'.
 
---with-group=GROUP sets the group as which MasqMail will run. Default
-is 'trusted'. GROUP has to exist before you 'make install'.
+--with-group=GROUP
+sets the group as which masqmail will run. Default is 'trusted'. GROUP
+has to exist before you 'make install'.
 
---with-logdir=LOGDIR sets the directory where MasqMail stores its log
-files. It will be created if it does not exist. Default is /var/masqmail/.
+
+--with-logdir=LOGDIR
+sets the directory where masqmail stores its log files. It will be
+created if it does not exist. Default is /var/log/masqmail/.
 
---with-spooldir=SPOOLDIR sets the directory where MasqMail stores its
-spool files. It will be created if it does not exist. Default is
-/var/spool/masqmail/.
+--with-spooldir=SPOOLDIR
+sets the directory where masqmail stores its spool files. It will be
+created if it does not exist. Default is /var/spool/masqmail/.
 
---with-confdir=CONFDIR sets the default configuration directory to
-CONFDIR, in case you prefer another location than /etc/masqmail/.
+--with-confdir=CONFDIR
+sets the default configuration directory to CONFDIR, in case you
+prefer another location than /etc/masqmail/.
+
 
---enable-auth enables ESMTP AUTH support (disabled by default)
+--enable-auth
+enables ESMTP AUTH support (disabled by default)
 
---disable-pop3 disables pop3 support (enabled by default)
-
---enable-maildir enables qmail style Maildir support (disabled by default)
+--enable-maildir
+enables qmail style Maildir support (disabled by default)
 
---enable-ident enable RFC 1413 support. If you have the libident
-dynamic library installed, this will be linked, otherwise it will be
-statically linked using the sources included in the package.
+--enable-ident
+enable RFC 1413 support. If you have the libident dynamic library
+installed, this will be linked, otherwise it will be statically linked
+using the sources included in the package.
 
---disable-resolver disable resolver support. Without the resolver functions,
-masqmail uses only gethostbyname() to resolve DNS names, and you cannot send
-mail without a smart host. Not recommended. You save 3K at most.
+--enable-pop3
+enables pop3 support (disabled by default)
+
+--disable-resolver
+disable resolver support. Without the resolver functions, masqmail
+uses only gethostbyname() to resolve DNS names, and you cannot send
+mail without a smart host. Not recommended.
 
---disable-smtp-server disable SMTP server support. You may want this if you do
-not need masqmail to listen. In this case, you cannot use masqmail as a smart
-host for other hosts on your LAN, you cannot use mail clients that send SMTP,
-you cannot even use pine. In short, use of this option is discouraged unless
-your resources are extremely limited.
+--disable-smtp-server
+disable SMTP server support. You may want this if you do not need
+masqmail to listen. In this case, you cannot use masqmail as a smart
+host for other hosts on your LAN, you cannot use mail clients that
+send SMTP, you cannot even use pine. In short, use of this option is
+discouraged unless your resources are extremely limited.
 
---enable-mserver enable online detection by connecting to the mserver
-(masqdialer system).
 
---with-libcryto instead of using the md5 and hmac functions within the package,
-link dynamically with libcrypto. This applies only if you have pop3 or SMTP
-AUTH enabled. Makes only sense if your resources are limited and you have
-libcrypto installed. Untested.
+--with-libcryto
+instead of using the md5 and hmac functions within the package, link
+dynamically with libcrypto. This applies only if you have pop3 or SMTP
+AUTH enabled. Makes only sense if your resources are limited and you
+have libcrypto installed. Untested.
 
---with-glib-static link with glib statically. This makes the binary larger
-by around 30K (i386 architecture), but if masqmail is the only binary using
-glib, you save some space in total, because you do not need the shared glib
+--with-glib-static
+link with glib statically. This makes the binary larger by around 30K
+(i386 architecture), but if masqmail is the only binary using glib,
+you save some space in total, because you do not need the shared glib
 library installed.
 
---disable-debug disable debugging, setting it on by command line or configuration
-has no effect. Strongly discouraged, since you miss valuable information if something
-goes wrong. You save 6K.
 
-BTW, to get 3K of space, call
-strip --remove-section=.comment --remove-section=.note --strip-unneeded src/masqmail
+--disable-debug
+disable debugging, setting it on by command line or configuration has
+no effect. Strongly discouraged, since you miss valuable information
+if something goes wrong.
 
 
 
-after make install:
--------------------
-
-You can also use these instructions to omit 'make install' if you do
-not want to use it.
+Checking the installation
+-------------------------
 
 Check that 'make install' worked correctly. The following command:
 
-	ls -ld /usr/sbin/masqmail /etc/masqmail /var/log/masqmail/ \
+	ls -ld /usr/local/sbin/masqmail /etc/masqmail /var/log/masqmail/ \
 	       /var/run/masqmail /var/spool/masqmail/ /var/spool/masqmail/* 
 
 should give output similar to
 
-	-rwsr-xr-x 1 root root    399356 May 10 12:34 /usr/sbin/masqmail
+	-rwsr-xr-x 1 root root    399356 May 10 12:34 /usr/local/sbin/masqmail
 	drwxr-xr-x 2 root root      4096 May 10 12:34 /etc/masqmail
 	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/log/masqmail
 	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/run/masqmail
@@ -116,85 +132,71 @@
 	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/lock
 	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/popuidl
 
-(important is the set-user-id bit for /usr/sbin/masqmail and the
-ownership of all items).
+Important are the set-user-id bit for /usr/local/sbin/masqmail and
+the permissions of all files.
+
+
 
-Use the example configuration files in examples/ to edit your own. The
-main configuration file `masqmail.conf' and the *.route and *.get files
-should go into /etc/masqmail.
+Making masqmail the default
+---------------------------
 
-The default destination for the executable `masqmail' is /usr/sbin.
-Check that it has the set-uid bit set. You can set it with:
+`sendmail' is the de-facto standard name of the system's MTA, no
+matter which MTA actually runs. If you want to make masqmail the
+system's MTA (i.e. replace sendmail, postfix, etc), make a symbolic
+link:
 
-	chmod u+s /usr/sbin/masqmail
+	ln -s /usr/local/sbin/masqmail /usr/lib/sendmail
 
-If you want to replace sendmail, move your old sendmail binary to
-another name and make a symbolic link:
+Now every mailer that used to call sendmail will now call masqmail.
+If you already had an MTA installed and running, you can kill it and
+start masqmail. Probably with:
 
-	ln -s /usr/sbin/masqmail /usr/sbin/sendmail
+	/etc/init.d/sendmail restart
 
-Now every mailer that used to call sendmail will now call masqmail. You
-can now kill your old sendmail if it is running and start masqmail.
+If this doesn't work as expected, you might need to add a special init
+script for masqmail. Currently none is distributed with masqmail.
+(Hopefully this will change soon.) Please ask on the mailing list for
+help.
 
-	/sbin/init.d/sendmail restart
+You can also directly start masqmail as daemon with:
 
-should do that. You can also start masqmail with:
-
-	/usr/sbin/masqmail -bd -q30m
+	/usr/local/sbin/masqmail -bd -q30m
 
 
 
-Configuring for online delivery
--------------------------------
+Basic Configuration
+-------------------
 
-(This section covers dial-up internet connections.)
+The only thing you must configure in order to use masqmail is the
+hostname. It's the name under which masqmail operates. In most cases
+it is the same as the machine's name, but it can be different.
 
-Now you have to set up the online configuration. The trick is to tell
-your ip-up script the connection name. You could use the IP number of
-the far side of the ppp link, but this is a pain and may change each
-time. But you can give it an additional argument via pppd with ipparam.
-Somewhere in your dial up script you have a line similar to:
+The script `contrib/guess-hostname' tries to print the hostname of
+your machine. The first output line is probably the best choice.
 
-	/usr/sbin/pppd /dev/ttyS1 connect "/usr/sbin/chat -t 90 -f $CHATFILE" \
-	-d -d -d user user@somewhere file "$OPTIONS"
+Create a minimal config with:
 
-Just add 'ipparam FastNet' in the command line for pppd if your ISP has
-the name FastNet. The ip-up script will then get 'FastNet' as a sixth
-parameter. In your ip-up script you can then call masqmail with
+	echo "host_name = HOSTNAME" >/etc/masqmail/masqmail.conf
 
-	/usr/sbin/masqmail -qo "$6"
+(Substitute `HOSTNAME' with the real value, of course.)
 
-instead of 'sendmail -q', if you had that in the script before.
-Masqmail will then read the route configuration specified for the
-connection name 'FastNet' and deliver the mail destined to the internet.
-See the configuration manual on how to write a route configuration or
-use one of the examples as a template.
-
-I do not know how do configure that for an ISDN adapter, but I am sure
-you will find something similar in the man pages.
-
-If you want mail that is received by masqmail from your local net to be
-delivered immediately using the route configuration, you have two
-possibilities:
+Such a setup (i.e. the default one) does:
+- deliver mail locally
+- accept mail from local (via stdin)
+- accept mail on localhost:25 (via SMTP)
+It does not
+- transfer any mail to other machines
+- accept mail from outside your machine
 
-* if you are using the masqdialer system, you just have to set the
-  variables online_detect to pipe and online_pipe to something like
-	/usr/bin/mservdetect localhost 222
-  if mserver is running on localhost and listens on port 222. See the
-  man page to mservdetect(1).
 
-* otherwise you have to add two commands in your ip-up script:
-	echo "$6" >/var/run/masqmail/masqmail-route
-	chmod 644 /var/run/masqmail/masqmail-route
-  and you have to remove the file /var/run/masqmail/masqmail-route in
-  your ip-down script:
-	rm /var/run/masqmail/masqmail-route
-  Then you have to set online_detect to file and online_file to
-  /var/run/masqmail/masqmail-route
+For more elaborate setups, have a look at docs/*setup and
+docs/INSTALL*. You can also take the example configuration files in
+examples/ as basis for your own. Take the man pages masqmail.conf(5)
+and masqmail.route(5) for reference.
 
-See the route documentation for more.
+All configuration files should go into /etc/masqmail.
 
 
 
 Written by oku.
-Updated by meillo.
+Improved by meillo.
--- a/NEWS	Tue Jul 13 22:53:04 2010 +0200
+++ b/NEWS	Tue Jul 13 22:54:25 2010 +0200
@@ -7,6 +7,13 @@
 The manual pages describe newly added options. Take them for reference.
 
 
+0.3.0
+
+- Started a new development branch. Attention: It will not maintain
+compatibility with 0.2.x versions. Upgrading from 0.2.x to 0.3.x will
+surely require manual adjustment of the configuration.
+
+
 0.2.25
 
 - Added server-side SMTP SIZE support. Thanks to Paolo.
--- a/acconfig.h	Tue Jul 13 22:53:04 2010 +0200
+++ b/acconfig.h	Tue Jul 13 22:54:25 2010 +0200
@@ -20,8 +20,6 @@
 
 #undef ENABLE_IDENT
 
-#undef ENABLE_MSERVER
-
 #undef CONF_DIR
 
 #undef DATA_DIR
--- a/config.h.in	Tue Jul 13 22:53:04 2010 +0200
+++ b/config.h.in	Tue Jul 13 22:54:25 2010 +0200
@@ -21,8 +21,6 @@
 
 #undef ENABLE_IDENT
 
-#undef ENABLE_MSERVER
-
 #undef CONF_DIR
 
 #undef DATA_DIR
@@ -53,9 +51,6 @@
 /* If Maildirs are enabled */
 #undef ENABLE_MAILDIR
 
-/* If mserver support is enabled */
-#undef ENABLE_MSERVER
-
 /* If the POP3 support is enabled */
 #undef ENABLE_POP3
 
@@ -131,6 +126,9 @@
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
+/* The log directory */
+#undef LOG_DIR
+
 /* Name of package */
 #undef PACKAGE
 
@@ -158,6 +156,9 @@
 /* The sbin directory */
 #undef SBINDIR
 
+/* The spool directory */
+#undef SPOOL_DIR
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
--- a/configure	Tue Jul 13 22:53:04 2010 +0200
+++ b/configure	Tue Jul 13 22:54:25 2010 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for masqmail 0.2.25.
+# Generated by GNU Autoconf 2.65 for masqmail 0.3.0.
 #
 # Report bugs to <meillo@marmaro.de>.
 #
@@ -552,8 +552,8 @@
 # Identity of this package.
 PACKAGE_NAME='masqmail'
 PACKAGE_TARNAME='masqmail'
-PACKAGE_VERSION='0.2.25'
-PACKAGE_STRING='masqmail 0.2.25'
+PACKAGE_VERSION='0.3.0'
+PACKAGE_STRING='masqmail 0.3.0'
 PACKAGE_BUGREPORT='meillo@marmaro.de'
 PACKAGE_URL=''
 
@@ -711,7 +711,6 @@
 enable_maildir
 with_libcrypto
 enable_ident
-enable_mserver
 with_liblockfile
 with_logdir
 with_spooldir
@@ -1272,7 +1271,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures masqmail 0.2.25 to adapt to many kinds of systems.
+\`configure' configures masqmail 0.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1338,7 +1337,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of masqmail 0.2.25:";;
+     short | recursive ) echo "Configuration of masqmail 0.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1355,7 +1354,6 @@
   --enable-auth            enable AUTH (RFC 2554) client support
   --enable-maildir            enable qmail style maildir support
   --enable-ident           enable ident (RFC 1413) support
-  --enable-mserver         enable mserver support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1365,7 +1363,7 @@
   --with-glib-static=path  link glib statically (path mandatory!)
   --with-libcrypto         use libcrypto
   --with-liblockfile       use liblock (for Debian)
-  --with-logdir=DIR        set log directory /var/masqmail
+  --with-logdir=DIR        set log directory /var/log/masqmail
   --with-spooldir=DIR      set spool directory /var/spool/masqmail
   --with-confdir           directory for configuration /etc/masqmail
 
@@ -1452,7 +1450,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-masqmail configure 0.2.25
+masqmail configure 0.3.0
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1877,7 +1875,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by masqmail $as_me 0.2.25, which was
+It was created by masqmail $as_me 0.3.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2688,7 +2686,7 @@
 
 # Define the identity of the package.
  PACKAGE='masqmail'
- VERSION='0.2.25'
+ VERSION='0.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5188,9 +5186,6 @@
   enableval=$enable_pop3; if test "x$enable_pop3" != 'xno'; then
 		pop3_enabled='yes'
 	fi
-else
-  pop3_enabled='yes'
-
 fi
 
 if test "x$pop3_enabled" = xyes; then
@@ -5355,19 +5350,6 @@
 fi
 
 
-# Check whether --enable-mserver was given.
-if test "${enable_mserver+set}" = set; then :
-  enableval=$enable_mserver; if test "x$enable_mserver" != 'xno'; then
-		mserver_enabled='yes'
-	fi
-fi
-
-if test "x$mserver_enabled" = xyes; then
-
-$as_echo "#define ENABLE_MSERVER 1" >>confdefs.h
-
-fi
-
 
 # Check whether --with-liblockfile was given.
 if test "${with_liblockfile+set}" = set; then :
@@ -5440,6 +5422,11 @@
 fi
 
 
+cat >>confdefs.h <<_ACEOF
+#define LOG_DIR "${with_logdir}"
+_ACEOF
+
+
 
 
 # Check whether --with-spooldir was given.
@@ -5451,6 +5438,11 @@
 fi
 
 
+cat >>confdefs.h <<_ACEOF
+#define SPOOL_DIR "${with_spooldir}"
+_ACEOF
+
+
 
 
 # Check whether --with-confdir was given.
@@ -6019,7 +6011,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by masqmail $as_me 0.2.25, which was
+This file was extended by masqmail $as_me 0.3.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6085,7 +6077,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-masqmail config.status 0.2.25
+masqmail config.status 0.3.0
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
--- a/configure.ac	Tue Jul 13 22:53:04 2010 +0200
+++ b/configure.ac	Tue Jul 13 22:54:25 2010 +0200
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(masqmail, 0.2.25, meillo@marmaro.de)
+AC_INIT(masqmail, 0.3.0, meillo@marmaro.de)
 AC_CONFIG_SRCDIR([src/masqmail.c])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE()
@@ -146,7 +146,6 @@
 	if test "x$enable_pop3" != 'xno'; then
 		pop3_enabled='yes'
 	fi,
-	pop3_enabled='yes'
 	)
 if test "x$pop3_enabled" = xyes; then
 	AC_DEFINE(ENABLE_POP3, 1, [If the POP3 support is enabled])
@@ -217,17 +216,6 @@
 fi
 AC_SUBST(IDENT_LIBS)
 
-dnl mserver support (default is to not use it)
-AC_ARG_ENABLE(mserver,
-	[  --enable-mserver         enable mserver support],
-	if test "x$enable_mserver" != 'xno'; then
-		mserver_enabled='yes'
-	fi,
-	)
-if test "x$mserver_enabled" = xyes; then
-	AC_DEFINE(ENABLE_MSERVER, 1, [If mserver support is enabled])
-fi
-
 dnl liblockfile
 AC_ARG_WITH(liblockfile,
 	[  --with-liblockfile       use liblock (for Debian)],
@@ -247,10 +235,11 @@
 
 dnl log and spool directories
 AC_ARG_WITH(logdir,
-	[  --with-logdir=DIR        set log directory [/var/masqmail]],
+	[  --with-logdir=DIR        set log directory [/var/log/masqmail]],
 	,
         with_logdir='/var/log/masqmail/'
 	)
+AC_DEFINE_UNQUOTED(LOG_DIR, "${with_logdir}", [The log directory])
 AC_SUBST(with_logdir)
 
 AC_ARG_WITH(spooldir,
@@ -258,6 +247,7 @@
 	,
 	with_spooldir='/var/spool/masqmail/'
 	)
+AC_DEFINE_UNQUOTED(SPOOL_DIR, "${with_spooldir}", [The spool directory])
 AC_SUBST(with_spooldir)
 
 dnl configuration file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/guess-hostname	Tue Jul 13 22:54:25 2010 +0200
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# try several ways to guess the hostname
+# earlier output lines are probably better
+
+(
+
+# this is what Debian uses
+cat /etc/mailname
+
+# probably a good value on GNU/Linux
+hostname -f
+
+# this is often the short hostname
+cat /etc/hostname
+
+# often the short hostname, but widely available
+hostname
+
+# this file was mentioned on the Internet
+cat /etc/HOSTNAME
+
+) 2>/dev/null
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/ppp-setup	Tue Jul 13 22:54:25 2010 +0200
@@ -0,0 +1,51 @@
+This document covers dial-up internet connections with PPP
+----------------------------------------------------------
+
+Now you have to set up the online configuration. The trick is to tell
+your ip-up script the connection name. You could use the IP number of
+the far side of the ppp link, but this is a pain and may change each
+time. But you can give it an additional argument via pppd with ipparam.
+Somewhere in your dial up script you have a line similar to:
+
+	/usr/sbin/pppd /dev/ttyS1 connect "/usr/sbin/chat -t 90 -f $CHATFILE" \
+	-d -d -d user user@somewhere file "$OPTIONS"
+
+Just add 'ipparam FastNet' in the command line for pppd if your ISP has
+the name FastNet. The ip-up script will then get 'FastNet' as a sixth
+parameter. In your ip-up script you can then call masqmail with
+
+	/usr/local/sbin/masqmail -qo "$6"
+
+instead of 'sendmail -q', if you had that in the script before.
+Masqmail will then read the route configuration specified for the
+connection name 'FastNet' and deliver the mail destined to the internet.
+See the configuration manual on how to write a route configuration or
+use one of the examples as a template.
+
+I do not know how do configure that for an ISDN adapter, but I am sure
+you will find something similar in the man pages.
+
+If you want mail that is received by masqmail from your local net to be
+delivered immediately using the route configuration, you have two
+possibilities:
+
+* if you are using the masqdialer system, you just have to set the
+  variables online_detect to pipe and online_pipe to something like
+	/usr/bin/mservdetect localhost 224
+  if mserver is running on localhost and listens on port 224. See the
+  man page to mservdetect(1).
+
+* otherwise you have to add two commands in your ip-up script:
+	echo "$6" >/var/run/masqmail/masqmail-route
+	chmod 644 /var/run/masqmail/masqmail-route
+  and you have to remove the file /var/run/masqmail/masqmail-route in
+  your ip-down script:
+	rm /var/run/masqmail/masqmail-route
+  Then you have to set online_detect to file and online_file to
+  /var/run/masqmail/masqmail-route
+
+See the route documentation for more.
+
+
+written by oku
+(it was once located inside of INSTALL)
--- a/examples/masqmail.conf	Tue Jul 13 22:53:04 2010 +0200
+++ b/examples/masqmail.conf	Tue Jul 13 22:54:25 2010 +0200
@@ -55,10 +55,6 @@
 
 # online detection:
 #
-# for 'mserver' uncomment next 2 lines and optionally change mserver_iface:
-#online_detect = mserver
-#mserver_iface = "localhost:222"
-
 # for 'file' uncomment next 2 lines
 #online_detect = file
 #online_file = "/var/run/masqmail/masqmail-route"
--- a/man/masqmail.conf.5	Tue Jul 13 22:53:04 2010 +0200
+++ b/man/masqmail.conf.5	Tue Jul 13 22:54:25 2010 +0200
@@ -67,24 +67,28 @@
 
 The directory where log are stored, if syslog is not used.
 Debug files are stored in this directory anyways.
-\fI/var/log/masqmail\fR is a common value.
 \fIfile\fR must be an absolute path.
 
+Default: \fI/var/log/masqmail\fR
+
 .TP
 \fBmail_dir = \fIfile\fR
 
 The directory where local mail is stored, usually \fI/var/spool/mail\fR or \fI/var/mail\fR.
 \fIfile\fR must be an absolute path.
 
+Default: \fI/var/mail\fR
+
 .TP
 \fBspool_dir = \fIfile\fR
 
 The directory where masqmail stores its spool files (and later also other stuff).
 It must have a subdirectory \fIinput\fR.
 Masqmail needs read and write permissions for this directory.
-I suggest to use \fI/var/spool/masqmail\fR.
 \fIfile\fR must be an absolute path.
 
+Default: \fI/var/spool/masqmail\fR
+
 .TP
 \fBlock_dir = \fIfile\fR
 
@@ -106,6 +110,8 @@
 
 It is not used to find whether an address is local. Use \fBlocal_hosts\fR for that.
 
+Default: none; \fBhost_name\fP MUST be set in the config file
+
 .TP
 \fBremote_port = \fIn\fR
 
@@ -119,9 +125,14 @@
 \fBlocal_hosts = \fIlist\fR
 
 A semicolon `;' separated list of hostnames which are considered local.
-Normally you set it to "localhost;foo;foo.bar.com" if your host has the
+Normally you should set it to "localhost;foo;foo.bar.com" if your host has the
 fully qualified domain name `foo.bar.com'.
 
+Default: localhost ; <value of \fBhost_name\fR cut at the first dot> ; <value of \fBhost_name\fR>
+
+Example: \fIlocalhost;foo;foo.example.org\fR
+(if you have set \fBhost_name\fR to \fIfoo.example.org\fR)
+
 .TP
 \fBlocal_nets = \fIlist\fR
 
@@ -174,6 +185,8 @@
 If your host has different names which resolve to the same IP,
 use only one of them, otherwise you will get an error message.
 
+Default: \fIlocalhost:25\fR (i.e. only local processes can connect)
+
 .TP
 \fBdo_save_envelope_to = \fIboolean\fR
 
@@ -344,7 +357,7 @@
 \fBonline_detect = \fIstring\fR
 
 Defines the method masqmail uses to detect whether there is currently an online connection.
-It can have the values \fIfile\fR, \fIpipe\fR, or \fImserver\fR.
+It can have the values \fIfile\fR or \fIpipe\fR.
 
 When it is set to \fIfile\fR, masqmail first checks for the existence of \fBonline_file\fR
 (see below) and if it exists, it reads it.
@@ -354,12 +367,6 @@
 When it is set to \fIpipe\fR, masqmail calls the executable given by the
 \fBonline_pipe\fR option (see below) and reads the current online status from its standard output.
 
-When it is set to \fImserver\fR, masqmail connects to the masqdialer server
-using the value of \fBmserver_iface\fR and asks it whether a connection exists and for the name,
-which should be the name of the current connection as defined with \fBconnect_route.\fIname\fR.
-\fBThe mserver detection method is OBSOLETE.\fR
-See mserver_iface for a note on how to replace it.
-
 No matter how masqmail detects the online status,
 only messages that are accepted at online time will be delivered using the connection.
 The spool still has to be emptied with masqmail \fB\-qo\fIconnection\fR.
@@ -397,21 +404,20 @@
 Of course, instead of the example above you could as well use \fIfile\fR as
 the online detection method, but you can do something more sophisticated.
 
-.TP
-\fBmserver_iface = \fIinterface\fR
+\fIfile\fR must contain an absolute path to an executable program.
+It can contain optional arguments.
 
-\fBThis option is OBSOLETE\fP, use
+Example: \fI/bin/echo foo\fR
+(This tells masqmail to be always online with connection `foo'.)
+
+For querying a masqdialer server
+(= asking it whether a connection exists and what its name is)
+use:
 
 online_method=pipe
 
-online_pipe="/usr/bin/mservdetect localhost 222"
-
-instead.
+online_pipe="/usr/bin/mservdetect localhost 224"
 
-The interface the masqdialer server is listening to.
-Usually this will be "localhost:224" if mserver is running on the same host as masqmail.
-But using this option, you can also let masqmail run on another host by setting
-\fBmserver_iface\fR to another hostname, e.g. "foo:224".
 
 .TP
 \fBget.\fIname\fR = \fIfile\fR
--- a/src/Makefile.am	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/Makefile.am	Tue Jul 13 22:54:25 2010 +0200
@@ -12,7 +12,6 @@
 	readsock.h\
 	smtp_out.h\
 	lookup.h\
-	mserver.h\
 	accept.c\
 	address.c\
 	alias.c\
@@ -32,7 +31,6 @@
 	lookup.c\
 	masqmail.c\
 	message.c\
-	mserver.c\
 	online.c\
 	parse.c\
 	peopen.c\
@@ -72,10 +70,8 @@
 mservdetect_SOURCES=\
 	masqmail.h\
 	readsock.h\
-	mserver.h\
 	mservdetect.c\
 	interface.c\
-	mserver.c\
 	readsock.c\
 	peopen.c
 
--- a/src/Makefile.in	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/Makefile.in	Tue Jul 13 22:54:25 2010 +0200
@@ -53,16 +53,16 @@
 	expand.$(OBJEXT) fail_msg.$(OBJEXT) get.$(OBJEXT) \
 	header.$(OBJEXT) interface.$(OBJEXT) local.$(OBJEXT) \
 	log.$(OBJEXT) listen.$(OBJEXT) lookup.$(OBJEXT) \
-	masqmail.$(OBJEXT) message.$(OBJEXT) mserver.$(OBJEXT) \
-	online.$(OBJEXT) parse.$(OBJEXT) peopen.$(OBJEXT) \
-	permissions.$(OBJEXT) pop3_in.$(OBJEXT) readsock.$(OBJEXT) \
-	rewrite.$(OBJEXT) route.$(OBJEXT) queue.$(OBJEXT) \
-	smtp_in.$(OBJEXT) smtp_out.$(OBJEXT) spool.$(OBJEXT) \
-	tables.$(OBJEXT) timeival.$(OBJEXT)
+	masqmail.$(OBJEXT) message.$(OBJEXT) online.$(OBJEXT) \
+	parse.$(OBJEXT) peopen.$(OBJEXT) permissions.$(OBJEXT) \
+	pop3_in.$(OBJEXT) readsock.$(OBJEXT) rewrite.$(OBJEXT) \
+	route.$(OBJEXT) queue.$(OBJEXT) smtp_in.$(OBJEXT) \
+	smtp_out.$(OBJEXT) spool.$(OBJEXT) tables.$(OBJEXT) \
+	timeival.$(OBJEXT)
 masqmail_OBJECTS = $(am_masqmail_OBJECTS)
 masqmail_DEPENDENCIES =
 am_mservdetect_OBJECTS = mservdetect.$(OBJEXT) interface.$(OBJEXT) \
-	mserver.$(OBJEXT) readsock.$(OBJEXT) peopen.$(OBJEXT)
+	readsock.$(OBJEXT) peopen.$(OBJEXT)
 mservdetect_OBJECTS = $(am_mservdetect_OBJECTS)
 mservdetect_DEPENDENCIES =
 am_readtest_OBJECTS = readsock.$(OBJEXT) readtest.$(OBJEXT)
@@ -240,7 +240,6 @@
 	readsock.h\
 	smtp_out.h\
 	lookup.h\
-	mserver.h\
 	accept.c\
 	address.c\
 	alias.c\
@@ -260,7 +259,6 @@
 	lookup.c\
 	masqmail.c\
 	message.c\
-	mserver.c\
 	online.c\
 	parse.c\
 	peopen.c\
@@ -300,10 +298,8 @@
 mservdetect_SOURCES = \
 	masqmail.h\
 	readsock.h\
-	mserver.h\
 	mservdetect.c\
 	interface.c\
-	mserver.c\
 	readsock.c\
 	peopen.c
 
@@ -466,7 +462,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masqmail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mservdetect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mserver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/online.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peopen.Po@am__quote@
--- a/src/conf.c	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/conf.c	Tue Jul 13 22:54:25 2010 +0200
@@ -432,9 +432,12 @@
 	conf.alias_local_cmp = strcmp;
 	conf.max_defer_time = 86400 * 4;  /* 4 days */
 	conf.max_msg_size = 0; /* no limit on msg size */
+	conf.spool_dir = SPOOL_DIR;
+	conf.mail_dir = "/var/mail";
+	conf.listen_addresses = g_list_append(NULL, parse_interface("localhost", 25));
 
 	if ((in = fopen(filename, "r")) == NULL) {
-		fprintf(stderr, "could not open config file %s: %s\n", filename, strerror(errno));
+		logwrite(LOG_ALERT, "could not open config file %s: %s\n", filename, strerror(errno));
 		return FALSE;
 	}
 
@@ -463,7 +466,7 @@
 				char buf[256];
 				FILE *fptr = fopen(rval, "rt");
 				if (fptr) {
-					fprintf(stderr, "could not open %s: %s\n", rval, strerror(errno));
+					logwrite(LOG_ALERT, "could not open %s: %s\n", rval, strerror(errno));
 					return FALSE;
 				}
 				fgets(buf, 255, fptr);
@@ -472,7 +475,7 @@
 				fclose(fptr);
 			}
 		} else if (strcmp(lval, "remote_port") == 0) {
-			fprintf(stderr, "the remote_port option is now deprecated. Use 'mail_host' in the\n"
+			logwrite(LOG_WARNING, "the remote_port option is now deprecated. Use 'mail_host' in the\n"
 							"route configuration instead. See man masqmail.route\n");
 			conf.remote_port = atoi(rval);
 		} else if (strcmp(lval, "local_hosts") == 0)
@@ -533,7 +536,7 @@
 			}
 			g_list_free(tmp_list);
 #else
-			fprintf(stderr, "%s ignored: not compiled with ident support\n", lval);
+			logwrite(LOG_WARNING, "%s ignored: not compiled with ident support\n", lval);
 #endif
 		} else if ((strncmp(lval, "connect_route.", 14) == 0)
 		           || (strncmp(lval, "online_routes.", 14) == 0)) {
@@ -548,8 +551,6 @@
 			conf.online_file = g_strdup(rval);
 		else if (strcmp(lval, "online_pipe") == 0)
 			conf.online_pipe = g_strdup(rval);
-		else if (strcmp(lval, "mserver_iface") == 0)
-			conf.mserver_iface = parse_interface(rval, 224);
 		else if (strcmp(lval, "do_queue") == 0)
 			conf.do_queue = parse_boolean(rval);
 		else if (strncmp(lval, "get.", 4) == 0) {
@@ -557,7 +558,7 @@
 			table_pair *pair = create_pair_string(&(lval[4]), rval);
 			conf.get_names = g_list_append(conf.get_names, pair);
 #else
-			fprintf(stderr, "get.<name> ignored: not compiled with pop support\n");
+			logwrite(LOG_WARNING, "get.<name> ignored: not compiled with pop support\n");
 #endif
 		} else if (strncmp(lval, "online_gets.", 12) == 0) {
 #ifdef ENABLE_POP3
@@ -565,7 +566,7 @@
 			table_pair *pair = create_pair(&(lval[12]), file_list);
 			conf.online_gets = g_list_append(conf.online_gets, pair);
 #else
-			fprintf(stderr, "online_gets.<name> ignored: not compiled with pop support\n");
+			logwrite(LOG_WARNING, "online_gets.<name> ignored: not compiled with pop support\n");
 #endif
 		} else if (strcmp(lval, "errmsg_file") == 0)
 			conf.errmsg_file = g_strdup(rval);
@@ -577,7 +578,7 @@
 			gint dummy;
 			gint ival = time_interval(rval, &dummy);
 			if (ival < 0)
-				fprintf(stderr, "invalid time interval for 'max_defer_time': %s\n", rval);
+				logwrite(LOG_WARNING, "invalid time interval for 'max_defer_time': %s\n", rval);
 			else
 				conf.max_defer_time = ival;
 		} else if (strcmp(lval, "log_user") == 0)
@@ -588,10 +589,15 @@
 			                 rval, conf.max_msg_size);
 		}
 		else
-			fprintf(stderr, "var '%s' not (yet) known, ignored\n", lval);
+			logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval);
 	}
 	fclose(in);
 
+	if (!conf.host_name) {
+		logwrite(LOG_ALERT, "`host_name' MUST be set in masqmail.conf. See man page\n");
+		return FALSE;
+	}
+
 	if (conf.errmsg_file == NULL)
 		conf.errmsg_file = g_strdup(DATA_DIR "/tpl/failmsg.tpl");
 	if (conf.warnmsg_file == NULL)
@@ -606,6 +612,20 @@
 	if (conf.warn_intervals == NULL)
 		conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE);
 
+	if (!conf.local_hosts) {
+		char* shortname = strdup(conf.host_name);
+		char* p = strchr(shortname, '.');
+		if (p) {
+			*p = '\0';
+		}
+		/* we don't care if shortname and conf.host_name are the same */
+		char* local_hosts_str = g_strdup_printf("localhost;%s;%s", shortname, conf.host_name);
+		conf.local_hosts = parse_list(local_hosts_str, FALSE);
+		free(shortname);
+		free(local_hosts_str);
+	}
+
+
 	return TRUE;
 }
 
--- a/src/masqmail.c	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/masqmail.c	Tue Jul 13 22:54:25 2010 +0200
@@ -578,7 +578,6 @@
 		gchar *with_auth = "";
 		gchar *with_maildir = "";
 		gchar *with_ident = "";
-		gchar *with_mserver = "";
 
 #ifdef ENABLE_RESOLVER
 		with_resolver = " +resolver";
@@ -598,12 +597,9 @@
 #ifdef ENABLE_IDENT
 		with_ident = " +ident";
 #endif
-#ifdef ENABLE_MSERVER
-		with_mserver = " +mserver";
-#endif
 
-		printf("%s %s%s%s%s%s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_smtp_server,
-		       with_pop3, with_auth, with_maildir, with_ident, with_mserver);
+		printf("%s %s%s%s%s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_smtp_server,
+		       with_pop3, with_auth, with_maildir, with_ident);
 
 		exit(EXIT_SUCCESS);
 	}
@@ -642,7 +638,13 @@
 		}
 	}
 
-	read_conf(conf_file);
+	conf.log_dir = LOG_DIR;
+	logopen();
+	if (!read_conf(conf_file)) {
+		logwrite(LOG_ALERT, "SHUTTING DOWN due to problems reading config\n");
+		exit(5);
+	}
+	logclose();
 
 	if (do_queue)
 		conf.do_queue = TRUE;
--- a/src/masqmail.h	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/masqmail.h	Tue Jul 13 22:54:25 2010 +0200
@@ -210,7 +210,6 @@
 	gchar *online_detect;
 	gchar *online_file;
 	gchar *online_pipe;
-	interface *mserver_iface;
 
 	GList *get_names;
 	GList *online_gets;  /* list of pairs which point to lists */
--- a/src/mservdetect.c	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/mservdetect.c	Tue Jul 13 22:54:25 2010 +0200
@@ -16,23 +16,65 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-/*
-#include "masqmail.h"
-#include "readsock.h"
-#include "mserver.h"
-*/
 
 #include "config.h"
-
-/* ugly hack */
-#ifndef ENABLE_MSERVER
-#define ENABLE_MSERVER 1
-#include "mserver.c"
-#else
 #include "masqmail.h"
 #include "readsock.h"
-#include "mserver.h"
-#endif  /* ENABLE_MSERVER */
+
+
+gchar*
+mserver_detect_online(interface * iface)
+{
+	struct sockaddr_in saddr;
+	gchar *ret = NULL;
+
+	if (init_sockaddr(&saddr, iface)) {
+		int sock = socket(PF_INET, SOCK_STREAM, 0);
+		int dup_sock;
+		if (connect(sock, (struct sockaddr *) (&saddr), sizeof(saddr)) == 0) {
+			FILE *in, *out;
+			char buf[256];
+
+			dup_sock = dup(sock);
+			out = fdopen(sock, "w");
+			in = fdopen(dup_sock, "r");
+
+			if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
+				if (strncmp(buf, "READY", 5) == 0) {
+					fprintf(out, "STAT\n");
+					fflush(out);
+					if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
+						if (strncmp(buf, "DOWN", 4) == 0) {
+							ret = NULL;
+						} else if (strncmp(buf, "UP", 2) == 0) {
+							gchar *p = buf + 3;
+							while ((*p != ':') && *p)
+								p++;
+							if (*p) {
+								*p = 0;
+								p++;
+								if ((atoi(p) >= 0) && *p)
+									ret = g_strdup(buf + 3);
+							} else
+								logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
+						} else {
+							logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
+						}
+					}
+				}
+				fprintf(out, "QUIT");
+				fflush(out);
+
+				close(sock);
+				close(dup_sock);
+				fclose(in);
+				fclose(out);
+			}
+		}
+	}
+	return ret;
+}
+
 
 void
 logwrite(int pri, const char *fmt, ...)
--- a/src/mserver.c	Tue Jul 13 22:53:04 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*  MasqMail
-    Copyright (C) 1999/2000/2001 Oliver Kurth
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#include "masqmail.h"
-#include "readsock.h"
-#include "mserver.h"
-
-#ifdef ENABLE_MSERVER
-
-gchar*
-mserver_detect_online(interface * iface)
-{
-	struct sockaddr_in saddr;
-	gchar *ret = NULL;
-
-	if (init_sockaddr(&saddr, iface)) {
-		int sock = socket(PF_INET, SOCK_STREAM, 0);
-		int dup_sock;
-		if (connect(sock, (struct sockaddr *) (&saddr), sizeof(saddr)) == 0) {
-			FILE *in, *out;
-			char buf[256];
-
-			dup_sock = dup(sock);
-			out = fdopen(sock, "w");
-			in = fdopen(dup_sock, "r");
-
-			if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
-				if (strncmp(buf, "READY", 5) == 0) {
-					fprintf(out, "STAT\n");
-					fflush(out);
-					if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
-						if (strncmp(buf, "DOWN", 4) == 0) {
-							ret = NULL;
-						} else if (strncmp(buf, "UP", 2) == 0) {
-							gchar *p = buf + 3;
-							while ((*p != ':') && *p)
-								p++;
-							if (*p) {
-								*p = 0;
-								p++;
-								if ((atoi(p) >= 0) && *p)
-									ret = g_strdup(buf + 3);
-							} else
-								logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
-						} else {
-							logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
-						}
-					}
-				}
-				fprintf(out, "QUIT");
-				fflush(out);
-
-				close(sock);
-				close(dup_sock);
-				fclose(in);
-				fclose(out);
-			}
-		}
-	}
-	return ret;
-}
-
-#endif
--- a/src/mserver.h	Tue Jul 13 22:53:04 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*  MasqMail
-    Copyright (C) 2001 Oliver Kurth
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-gchar *mserver_detect_online(interface * iface);
--- a/src/online.c	Tue Jul 13 22:53:04 2010 +0200
+++ b/src/online.c	Tue Jul 13 22:54:25 2010 +0200
@@ -21,7 +21,6 @@
 #include <sys/wait.h>
 
 #include "masqmail.h"
-#include "mserver.h"
 #include "peopen.h"
 
 gchar *connection_name;
@@ -117,11 +116,6 @@
 			return NULL;
 		}
 
-#ifdef ENABLE_MSERVER
-	} else if (strcmp(conf.online_detect, "mserver") == 0) {
-		DEBUG(3) debugf("connection method 'mserver'\n");
-		return mserver_detect_online(conf.mserver_iface);
-#endif
 	} else if (strcmp(conf.online_detect, "pipe") == 0) {
 		DEBUG(3) debugf("connection method 'pipe'\n");
 		if (conf.online_pipe)