1.1 --- a/INSTALL	Thu Jul 08 14:04:39 2010 +0200
     1.2 +++ b/INSTALL	Thu Jul 08 22:01:33 2010 +0200
     1.3 @@ -72,9 +72,6 @@
     1.4  you cannot even use pine. In short, use of this option is discouraged unless
     1.5  your resources are extremely limited.
     1.6  
     1.7 ---enable-mserver enable online detection by connecting to the mserver
     1.8 -(masqdialer system).
     1.9 -
    1.10  --with-libcryto instead of using the md5 and hmac functions within the package,
    1.11  link dynamically with libcrypto. This applies only if you have pop3 or SMTP
    1.12  AUTH enabled. Makes only sense if your resources are limited and you have
    1.13 @@ -179,8 +176,8 @@
    1.14  
    1.15  * if you are using the masqdialer system, you just have to set the
    1.16    variables online_detect to pipe and online_pipe to something like
    1.17 -	/usr/bin/mservdetect localhost 222
    1.18 -  if mserver is running on localhost and listens on port 222. See the
    1.19 +	/usr/bin/mservdetect localhost 224
    1.20 +  if mserver is running on localhost and listens on port 224. See the
    1.21    man page to mservdetect(1).
    1.22  
    1.23  * otherwise you have to add two commands in your ip-up script:

     2.1 --- a/acconfig.h	Thu Jul 08 14:04:39 2010 +0200
     2.2 +++ b/acconfig.h	Thu Jul 08 22:01:33 2010 +0200
     2.3 @@ -20,8 +20,6 @@
     2.4  
     2.5  #undef ENABLE_IDENT
     2.6  
     2.7 -#undef ENABLE_MSERVER
     2.8 -
     2.9  #undef CONF_DIR
    2.10  
    2.11  #undef DATA_DIR

     3.1 --- a/config.h.in	Thu Jul 08 14:04:39 2010 +0200
     3.2 +++ b/config.h.in	Thu Jul 08 22:01:33 2010 +0200
     3.3 @@ -21,8 +21,6 @@
     3.4  
     3.5  #undef ENABLE_IDENT
     3.6  
     3.7 -#undef ENABLE_MSERVER
     3.8 -
     3.9  #undef CONF_DIR
    3.10  
    3.11  #undef DATA_DIR
    3.12 @@ -53,9 +51,6 @@
    3.13  /* If Maildirs are enabled */
    3.14  #undef ENABLE_MAILDIR
    3.15  
    3.16 -/* If mserver support is enabled */
    3.17 -#undef ENABLE_MSERVER
    3.18 -
    3.19  /* If the POP3 support is enabled */
    3.20  #undef ENABLE_POP3
    3.21  

     4.1 --- a/configure	Thu Jul 08 14:04:39 2010 +0200
     4.2 +++ b/configure	Thu Jul 08 22:01:33 2010 +0200
     4.3 @@ -711,7 +711,6 @@
     4.4  enable_maildir
     4.5  with_libcrypto
     4.6  enable_ident
     4.7 -enable_mserver
     4.8  with_liblockfile
     4.9  with_logdir
    4.10  with_spooldir
    4.11 @@ -1355,7 +1354,6 @@
    4.12    --enable-auth            enable AUTH (RFC 2554) client support
    4.13    --enable-maildir            enable qmail style maildir support
    4.14    --enable-ident           enable ident (RFC 1413) support
    4.15 -  --enable-mserver         enable mserver support
    4.16  
    4.17  Optional Packages:
    4.18    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    4.19 @@ -5352,19 +5350,6 @@
    4.20  fi
    4.21  
    4.22  
    4.23 -# Check whether --enable-mserver was given.
    4.24 -if test "${enable_mserver+set}" = set; then :
    4.25 -  enableval=$enable_mserver; if test "x$enable_mserver" != 'xno'; then
    4.26 -		mserver_enabled='yes'
    4.27 -	fi
    4.28 -fi
    4.29 -
    4.30 -if test "x$mserver_enabled" = xyes; then
    4.31 -
    4.32 -$as_echo "#define ENABLE_MSERVER 1" >>confdefs.h
    4.33 -
    4.34 -fi
    4.35 -
    4.36  
    4.37  # Check whether --with-liblockfile was given.
    4.38  if test "${with_liblockfile+set}" = set; then :

     5.1 --- a/configure.ac	Thu Jul 08 14:04:39 2010 +0200
     5.2 +++ b/configure.ac	Thu Jul 08 22:01:33 2010 +0200
     5.3 @@ -216,17 +216,6 @@
     5.4  fi
     5.5  AC_SUBST(IDENT_LIBS)
     5.6  
     5.7 -dnl mserver support (default is to not use it)
     5.8 -AC_ARG_ENABLE(mserver,
     5.9 -	[  --enable-mserver         enable mserver support],
    5.10 -	if test "x$enable_mserver" != 'xno'; then
    5.11 -		mserver_enabled='yes'
    5.12 -	fi,
    5.13 -	)
    5.14 -if test "x$mserver_enabled" = xyes; then
    5.15 -	AC_DEFINE(ENABLE_MSERVER, 1, [If mserver support is enabled])
    5.16 -fi
    5.17 -
    5.18  dnl liblockfile
    5.19  AC_ARG_WITH(liblockfile,
    5.20  	[  --with-liblockfile       use liblock (for Debian)],

     6.1 --- a/examples/masqmail.conf	Thu Jul 08 14:04:39 2010 +0200
     6.2 +++ b/examples/masqmail.conf	Thu Jul 08 22:01:33 2010 +0200
     6.3 @@ -55,10 +55,6 @@
     6.4  
     6.5  # online detection:
     6.6  #
     6.7 -# for 'mserver' uncomment next 2 lines and optionally change mserver_iface:
     6.8 -#online_detect = mserver
     6.9 -#mserver_iface = "localhost:222"
    6.10 -
    6.11  # for 'file' uncomment next 2 lines
    6.12  #online_detect = file
    6.13  #online_file = "/var/run/masqmail/masqmail-route"

     7.1 --- a/man/masqmail.conf.5	Thu Jul 08 14:04:39 2010 +0200
     7.2 +++ b/man/masqmail.conf.5	Thu Jul 08 22:01:33 2010 +0200
     7.3 @@ -357,7 +357,7 @@
     7.4  \fBonline_detect = \fIstring\fR
     7.5  
     7.6  Defines the method masqmail uses to detect whether there is currently an online connection.
     7.7 -It can have the values \fIfile\fR, \fIpipe\fR, or \fImserver\fR.
     7.8 +It can have the values \fIfile\fR or \fIpipe\fR.
     7.9  
    7.10  When it is set to \fIfile\fR, masqmail first checks for the existence of \fBonline_file\fR
    7.11  (see below) and if it exists, it reads it.
    7.12 @@ -367,12 +367,6 @@
    7.13  When it is set to \fIpipe\fR, masqmail calls the executable given by the
    7.14  \fBonline_pipe\fR option (see below) and reads the current online status from its standard output.
    7.15  
    7.16 -When it is set to \fImserver\fR, masqmail connects to the masqdialer server
    7.17 -using the value of \fBmserver_iface\fR and asks it whether a connection exists and for the name,
    7.18 -which should be the name of the current connection as defined with \fBconnect_route.\fIname\fR.
    7.19 -\fBThe mserver detection method is OBSOLETE.\fR
    7.20 -See mserver_iface for a note on how to replace it.
    7.21 -
    7.22  No matter how masqmail detects the online status,
    7.23  only messages that are accepted at online time will be delivered using the connection.
    7.24  The spool still has to be emptied with masqmail \fB\-qo\fIconnection\fR.
    7.25 @@ -416,21 +410,14 @@
    7.26  Example: \fI/bin/echo foo\fR
    7.27  (This tells masqmail to be always online with connection `foo'.)
    7.28  
    7.29 -.TP
    7.30 -\fBmserver_iface = \fIinterface\fR
    7.31 -
    7.32 -\fBThis option is OBSOLETE\fP, use
    7.33 +For querying a masqdialer server
    7.34 +(= asking it whether a connection exists and what its name is)
    7.35 +use:
    7.36  
    7.37  online_method=pipe
    7.38  
    7.39 -online_pipe="/usr/bin/mservdetect localhost 222"
    7.40 +online_pipe="/usr/bin/mservdetect localhost 224"
    7.41  
    7.42 -instead.
    7.43 -
    7.44 -The interface the masqdialer server is listening to.
    7.45 -Usually this will be "localhost:224" if mserver is running on the same host as masqmail.
    7.46 -But using this option, you can also let masqmail run on another host by setting
    7.47 -\fBmserver_iface\fR to another hostname, e.g. "foo:224".
    7.48  
    7.49  .TP
    7.50  \fBget.\fIname\fR = \fIfile\fR

     8.1 --- a/src/Makefile.am	Thu Jul 08 14:04:39 2010 +0200
     8.2 +++ b/src/Makefile.am	Thu Jul 08 22:01:33 2010 +0200
     8.3 @@ -12,7 +12,6 @@
     8.4  	readsock.h\
     8.5  	smtp_out.h\
     8.6  	lookup.h\
     8.7 -	mserver.h\
     8.8  	accept.c\
     8.9  	address.c\
    8.10  	alias.c\
    8.11 @@ -32,7 +31,6 @@
    8.12  	lookup.c\
    8.13  	masqmail.c\
    8.14  	message.c\
    8.15 -	mserver.c\
    8.16  	online.c\
    8.17  	parse.c\
    8.18  	peopen.c\
    8.19 @@ -72,10 +70,8 @@
    8.20  mservdetect_SOURCES=\
    8.21  	masqmail.h\
    8.22  	readsock.h\
    8.23 -	mserver.h\
    8.24  	mservdetect.c\
    8.25  	interface.c\
    8.26 -	mserver.c\
    8.27  	readsock.c\
    8.28  	peopen.c
    8.29  

     9.1 --- a/src/Makefile.in	Thu Jul 08 14:04:39 2010 +0200
     9.2 +++ b/src/Makefile.in	Thu Jul 08 22:01:33 2010 +0200
     9.3 @@ -53,16 +53,16 @@
     9.4  	expand.$(OBJEXT) fail_msg.$(OBJEXT) get.$(OBJEXT) \
     9.5  	header.$(OBJEXT) interface.$(OBJEXT) local.$(OBJEXT) \
     9.6  	log.$(OBJEXT) listen.$(OBJEXT) lookup.$(OBJEXT) \
     9.7 -	masqmail.$(OBJEXT) message.$(OBJEXT) mserver.$(OBJEXT) \
     9.8 -	online.$(OBJEXT) parse.$(OBJEXT) peopen.$(OBJEXT) \
     9.9 -	permissions.$(OBJEXT) pop3_in.$(OBJEXT) readsock.$(OBJEXT) \
    9.10 -	rewrite.$(OBJEXT) route.$(OBJEXT) queue.$(OBJEXT) \
    9.11 -	smtp_in.$(OBJEXT) smtp_out.$(OBJEXT) spool.$(OBJEXT) \
    9.12 -	tables.$(OBJEXT) timeival.$(OBJEXT)
    9.13 +	masqmail.$(OBJEXT) message.$(OBJEXT) online.$(OBJEXT) \
    9.14 +	parse.$(OBJEXT) peopen.$(OBJEXT) permissions.$(OBJEXT) \
    9.15 +	pop3_in.$(OBJEXT) readsock.$(OBJEXT) rewrite.$(OBJEXT) \
    9.16 +	route.$(OBJEXT) queue.$(OBJEXT) smtp_in.$(OBJEXT) \
    9.17 +	smtp_out.$(OBJEXT) spool.$(OBJEXT) tables.$(OBJEXT) \
    9.18 +	timeival.$(OBJEXT)
    9.19  masqmail_OBJECTS = $(am_masqmail_OBJECTS)
    9.20  masqmail_DEPENDENCIES =
    9.21  am_mservdetect_OBJECTS = mservdetect.$(OBJEXT) interface.$(OBJEXT) \
    9.22 -	mserver.$(OBJEXT) readsock.$(OBJEXT) peopen.$(OBJEXT)
    9.23 +	readsock.$(OBJEXT) peopen.$(OBJEXT)
    9.24  mservdetect_OBJECTS = $(am_mservdetect_OBJECTS)
    9.25  mservdetect_DEPENDENCIES =
    9.26  am_readtest_OBJECTS = readsock.$(OBJEXT) readtest.$(OBJEXT)
    9.27 @@ -240,7 +240,6 @@
    9.28  	readsock.h\
    9.29  	smtp_out.h\
    9.30  	lookup.h\
    9.31 -	mserver.h\
    9.32  	accept.c\
    9.33  	address.c\
    9.34  	alias.c\
    9.35 @@ -260,7 +259,6 @@
    9.36  	lookup.c\
    9.37  	masqmail.c\
    9.38  	message.c\
    9.39 -	mserver.c\
    9.40  	online.c\
    9.41  	parse.c\
    9.42  	peopen.c\
    9.43 @@ -300,10 +298,8 @@
    9.44  mservdetect_SOURCES = \
    9.45  	masqmail.h\
    9.46  	readsock.h\
    9.47 -	mserver.h\
    9.48  	mservdetect.c\
    9.49  	interface.c\
    9.50 -	mserver.c\
    9.51  	readsock.c\
    9.52  	peopen.c
    9.53  
    9.54 @@ -466,7 +462,6 @@
    9.55  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/masqmail.Po@am__quote@
    9.56  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Po@am__quote@
    9.57  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mservdetect.Po@am__quote@
    9.58 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mserver.Po@am__quote@
    9.59  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/online.Po@am__quote@
    9.60  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
    9.61  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peopen.Po@am__quote@

    10.1 --- a/src/conf.c	Thu Jul 08 14:04:39 2010 +0200
    10.2 +++ b/src/conf.c	Thu Jul 08 22:01:33 2010 +0200
    10.3 @@ -551,8 +551,6 @@
    10.4  			conf.online_file = g_strdup(rval);
    10.5  		else if (strcmp(lval, "online_pipe") == 0)
    10.6  			conf.online_pipe = g_strdup(rval);
    10.7 -		else if (strcmp(lval, "mserver_iface") == 0)
    10.8 -			conf.mserver_iface = parse_interface(rval, 224);
    10.9  		else if (strcmp(lval, "do_queue") == 0)
   10.10  			conf.do_queue = parse_boolean(rval);
   10.11  		else if (strncmp(lval, "get.", 4) == 0) {

    11.1 --- a/src/masqmail.c	Thu Jul 08 14:04:39 2010 +0200
    11.2 +++ b/src/masqmail.c	Thu Jul 08 22:01:33 2010 +0200
    11.3 @@ -577,7 +577,6 @@
    11.4  		gchar *with_auth = "";
    11.5  		gchar *with_maildir = "";
    11.6  		gchar *with_ident = "";
    11.7 -		gchar *with_mserver = "";
    11.8  
    11.9  #ifdef ENABLE_RESOLVER
   11.10  		with_resolver = " +resolver";
   11.11 @@ -597,12 +596,9 @@
   11.12  #ifdef ENABLE_IDENT
   11.13  		with_ident = " +ident";
   11.14  #endif
   11.15 -#ifdef ENABLE_MSERVER
   11.16 -		with_mserver = " +mserver";
   11.17 -#endif
   11.18  
   11.19 -		printf("%s %s%s%s%s%s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_smtp_server,
   11.20 -		       with_pop3, with_auth, with_maildir, with_ident, with_mserver);
   11.21 +		printf("%s %s%s%s%s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_smtp_server,
   11.22 +		       with_pop3, with_auth, with_maildir, with_ident);
   11.23  
   11.24  		exit(EXIT_SUCCESS);
   11.25  	}

    12.1 --- a/src/masqmail.h	Thu Jul 08 14:04:39 2010 +0200
    12.2 +++ b/src/masqmail.h	Thu Jul 08 22:01:33 2010 +0200
    12.3 @@ -210,7 +210,6 @@
    12.4  	gchar *online_detect;
    12.5  	gchar *online_file;
    12.6  	gchar *online_pipe;
    12.7 -	interface *mserver_iface;
    12.8  
    12.9  	GList *get_names;
   12.10  	GList *online_gets;  /* list of pairs which point to lists */

    13.1 --- a/src/mservdetect.c	Thu Jul 08 14:04:39 2010 +0200
    13.2 +++ b/src/mservdetect.c	Thu Jul 08 22:01:33 2010 +0200
    13.3 @@ -16,23 +16,65 @@
    13.4      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    13.5  */
    13.6  
    13.7 -/*
    13.8 +
    13.9 +#include "config.h"
   13.10  #include "masqmail.h"
   13.11  #include "readsock.h"
   13.12 -#include "mserver.h"
   13.13 -*/
   13.14  
   13.15 -#include "config.h"
   13.16  
   13.17 -/* ugly hack */
   13.18 -#ifndef ENABLE_MSERVER
   13.19 -#define ENABLE_MSERVER 1
   13.20 -#include "mserver.c"
   13.21 -#else
   13.22 -#include "masqmail.h"
   13.23 -#include "readsock.h"
   13.24 -#include "mserver.h"
   13.25 -#endif  /* ENABLE_MSERVER */
   13.26 +gchar*
   13.27 +mserver_detect_online(interface * iface)
   13.28 +{
   13.29 +	struct sockaddr_in saddr;
   13.30 +	gchar *ret = NULL;
   13.31 +
   13.32 +	if (init_sockaddr(&saddr, iface)) {
   13.33 +		int sock = socket(PF_INET, SOCK_STREAM, 0);
   13.34 +		int dup_sock;
   13.35 +		if (connect(sock, (struct sockaddr *) (&saddr), sizeof(saddr)) == 0) {
   13.36 +			FILE *in, *out;
   13.37 +			char buf[256];
   13.38 +
   13.39 +			dup_sock = dup(sock);
   13.40 +			out = fdopen(sock, "w");
   13.41 +			in = fdopen(dup_sock, "r");
   13.42 +
   13.43 +			if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
   13.44 +				if (strncmp(buf, "READY", 5) == 0) {
   13.45 +					fprintf(out, "STAT\n");
   13.46 +					fflush(out);
   13.47 +					if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
   13.48 +						if (strncmp(buf, "DOWN", 4) == 0) {
   13.49 +							ret = NULL;
   13.50 +						} else if (strncmp(buf, "UP", 2) == 0) {
   13.51 +							gchar *p = buf + 3;
   13.52 +							while ((*p != ':') && *p)
   13.53 +								p++;
   13.54 +							if (*p) {
   13.55 +								*p = 0;
   13.56 +								p++;
   13.57 +								if ((atoi(p) >= 0) && *p)
   13.58 +									ret = g_strdup(buf + 3);
   13.59 +							} else
   13.60 +								logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
   13.61 +						} else {
   13.62 +							logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
   13.63 +						}
   13.64 +					}
   13.65 +				}
   13.66 +				fprintf(out, "QUIT");
   13.67 +				fflush(out);
   13.68 +
   13.69 +				close(sock);
   13.70 +				close(dup_sock);
   13.71 +				fclose(in);
   13.72 +				fclose(out);
   13.73 +			}
   13.74 +		}
   13.75 +	}
   13.76 +	return ret;
   13.77 +}
   13.78 +
   13.79  
   13.80  void
   13.81  logwrite(int pri, const char *fmt, ...)

    14.1 --- a/src/mserver.c	Thu Jul 08 14:04:39 2010 +0200
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,78 +0,0 @@
    14.4 -/*  MasqMail
    14.5 -    Copyright (C) 1999/2000/2001 Oliver Kurth
    14.6 -
    14.7 -    This program is free software; you can redistribute it and/or modify
    14.8 -    it under the terms of the GNU General Public License as published by
    14.9 -    the Free Software Foundation; either version 2 of the License, or
   14.10 -    (at your option) any later version.
   14.11 -
   14.12 -    This program is distributed in the hope that it will be useful,
   14.13 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   14.14 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   14.15 -    GNU General Public License for more details.
   14.16 -
   14.17 -    You should have received a copy of the GNU General Public License
   14.18 -    along with this program; if not, write to the Free Software
   14.19 -    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   14.20 -*/
   14.21 -
   14.22 -#include "masqmail.h"
   14.23 -#include "readsock.h"
   14.24 -#include "mserver.h"
   14.25 -
   14.26 -#ifdef ENABLE_MSERVER
   14.27 -
   14.28 -gchar*
   14.29 -mserver_detect_online(interface * iface)
   14.30 -{
   14.31 -	struct sockaddr_in saddr;
   14.32 -	gchar *ret = NULL;
   14.33 -
   14.34 -	if (init_sockaddr(&saddr, iface)) {
   14.35 -		int sock = socket(PF_INET, SOCK_STREAM, 0);
   14.36 -		int dup_sock;
   14.37 -		if (connect(sock, (struct sockaddr *) (&saddr), sizeof(saddr)) == 0) {
   14.38 -			FILE *in, *out;
   14.39 -			char buf[256];
   14.40 -
   14.41 -			dup_sock = dup(sock);
   14.42 -			out = fdopen(sock, "w");
   14.43 -			in = fdopen(dup_sock, "r");
   14.44 -
   14.45 -			if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
   14.46 -				if (strncmp(buf, "READY", 5) == 0) {
   14.47 -					fprintf(out, "STAT\n");
   14.48 -					fflush(out);
   14.49 -					if (read_sockline(in, buf, 256, 15, READSOCKL_CHUG)) {
   14.50 -						if (strncmp(buf, "DOWN", 4) == 0) {
   14.51 -							ret = NULL;
   14.52 -						} else if (strncmp(buf, "UP", 2) == 0) {
   14.53 -							gchar *p = buf + 3;
   14.54 -							while ((*p != ':') && *p)
   14.55 -								p++;
   14.56 -							if (*p) {
   14.57 -								*p = 0;
   14.58 -								p++;
   14.59 -								if ((atoi(p) >= 0) && *p)
   14.60 -									ret = g_strdup(buf + 3);
   14.61 -							} else
   14.62 -								logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
   14.63 -						} else {
   14.64 -							logwrite(LOG_ALERT, "unexpected response from mserver after STAT cmd: %s", buf);
   14.65 -						}
   14.66 -					}
   14.67 -				}
   14.68 -				fprintf(out, "QUIT");
   14.69 -				fflush(out);
   14.70 -
   14.71 -				close(sock);
   14.72 -				close(dup_sock);
   14.73 -				fclose(in);
   14.74 -				fclose(out);
   14.75 -			}
   14.76 -		}
   14.77 -	}
   14.78 -	return ret;
   14.79 -}
   14.80 -
   14.81 -#endif

    15.1 --- a/src/mserver.h	Thu Jul 08 14:04:39 2010 +0200
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,19 +0,0 @@
    15.4 -/*  MasqMail
    15.5 -    Copyright (C) 2001 Oliver Kurth
    15.6 -
    15.7 -    This program is free software; you can redistribute it and/or modify
    15.8 -    it under the terms of the GNU General Public License as published by
    15.9 -    the Free Software Foundation; either version 2 of the License, or
   15.10 -    (at your option) any later version.
   15.11 -
   15.12 -    This program is distributed in the hope that it will be useful,
   15.13 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   15.14 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   15.15 -    GNU General Public License for more details.
   15.16 -
   15.17 -    You should have received a copy of the GNU General Public License
   15.18 -    along with this program; if not, write to the Free Software
   15.19 -    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   15.20 -*/
   15.21 -
   15.22 -gchar *mserver_detect_online(interface * iface);

    16.1 --- a/src/online.c	Thu Jul 08 14:04:39 2010 +0200
    16.2 +++ b/src/online.c	Thu Jul 08 22:01:33 2010 +0200
    16.3 @@ -21,7 +21,6 @@
    16.4  #include <sys/wait.h>
    16.5  
    16.6  #include "masqmail.h"
    16.7 -#include "mserver.h"
    16.8  #include "peopen.h"
    16.9  
   16.10  gchar *connection_name;
   16.11 @@ -117,11 +116,6 @@
   16.12  			return NULL;
   16.13  		}
   16.14  
   16.15 -#ifdef ENABLE_MSERVER
   16.16 -	} else if (strcmp(conf.online_detect, "mserver") == 0) {
   16.17 -		DEBUG(3) debugf("connection method 'mserver'\n");
   16.18 -		return mserver_detect_online(conf.mserver_iface);
   16.19 -#endif
   16.20  	} else if (strcmp(conf.online_detect, "pipe") == 0) {
   16.21  		DEBUG(3) debugf("connection method 'pipe'\n");
   16.22  		if (conf.online_pipe)