* NEWS: Update.

* mailbox/Makefile.am: Replace tcpsrv.c with ipsrv.c. * mailbox/tcpsrv.c: Replace with ... * mailbox/ipsrv.c: ... this file, which supports both TCP and UDP. * mailbox/msrv.c: Use mu_ip_server_t. * mailbox/server.c (mu_server_destroy): Bugfix. * comsat/comsat.c, comsat/comsat.h: Use m-server. * maidag/lmtp.c, maidag/maidag.h, pop3d/pop3d.c: Update to match changed m-server types. * include/mailutils/server.h (mu_tcp_*): Replace with mu_ip_*. Add new prototypes. * include/mailutils/types.hin: Likewise. * lib/tcpwrap.c, lib/tcpwrap.h (mu_tcp_wrapper_prefork): Update signature to match mu_m_server_prefork_fp. * examples/echosrv.c: Use mu_ip_server_t * imap4d/idle.c, imap4d/imap4d.c, imap4d/imap4d.h, imap4d/preauth.c, imap4d/util.c: Remove mu_gocs_daemon. * include/mailutils/gocs.h, include/mailutils/libargp.h, include/mailutils/libargp.h, libargp/cmdline.c, libargp/common.c, libcfg/common.c, libcfg/init.c, mailbox/daemon.c, mailbox/gocs.c: Remove mu_gocs_daemon. * mailbox/amd.c (amd_open): Provide a null-locker. * include/mailutils/locker.h, mailbox/locker.c (mu_locker_mod_flags): New function. * examples/config/mailutils.schema: LDAP schema for Mailutils. * examples/config/Makefile.am: Add mailutils.schema * dotlock/dotlock.c (main): Remove superfluous invocation of mu_locker_set_flags. * libproto/mbox/mbox.c (mbox_quick_get_message): Return MU_ERR_NOENT if mailbox is empty. * mailbox/tcpsrv.c (family_to_proto): Rename to mu_address_family_to_domain. * po/POTFILES.in: Update. * pop3d/lock.c (pop3d_lock): use mu_locker_mod_flags, instead of mu_locker_set_flags.

* NEWS: Update.
* mailbox/Makefile.am: Replace tcpsrv.c with ipsrv.c. * mailbox/tcpsrv.c: Replace with ... * mailbox/ipsrv.c: ... this file, which supports both TCP and UDP. * mailbox/msrv.c: Use mu_ip_server_t. * mailbox/server.c (mu_server_destroy): Bugfix. * comsat/comsat.c, comsat/comsat.h: Use m-server. * maidag/lmtp.c, maidag/maidag.h, pop3d/pop3d.c: Update to match changed m-server types. * include/mailutils/server.h (mu_tcp_*): Replace with mu_ip_*. Add new prototypes. * include/mailutils/types.hin: Likewise. * lib/tcpwrap.c, lib/tcpwrap.h (mu_tcp_wrapper_prefork): Update signature to match mu_m_server_prefork_fp. * examples/echosrv.c: Use mu_ip_server_t * imap4d/idle.c, imap4d/imap4d.c, imap4d/imap4d.h, imap4d/preauth.c, imap4d/util.c: Remove mu_gocs_daemon. * include/mailutils/gocs.h, include/mailutils/libargp.h, include/mailutils/libargp.h, libargp/cmdline.c, libargp/common.c, libcfg/common.c, libcfg/init.c, mailbox/daemon.c, mailbox/gocs.c: Remove mu_gocs_daemon. * mailbox/amd.c (amd_open): Provide a null-locker. * include/mailutils/locker.h, mailbox/locker.c (mu_locker_mod_flags): New function. * examples/config/mailutils.schema: LDAP schema for Mailutils. * examples/config/Makefile.am: Add mailutils.schema * dotlock/dotlock.c (main): Remove superfluous invocation of mu_locker_set_flags. * libproto/mbox/mbox.c (mbox_quick_get_message): Return MU_ERR_NOENT if mailbox is empty. * mailbox/tcpsrv.c (family_to_proto): Rename to mu_address_family_to_domain. * po/POTFILES.in: Update. * pop3d/lock.c (pop3d_lock): use mu_locker_mod_flags, instead of mu_locker_set_flags.
Sergey Poznyakoff
Commit 5d286f5d ... 5d286f5d98dc932fff3754e3c992c40a765a3167 authored 2008-01-05 20:30:10 +0000 by Sergey Poznyakoff
Showing 39 changed files with 912 additions and 721 deletions
ChangeLog
NEWS
comsat/comsat.c
comsat/comsat.h
dotlock/dotlock.c
examples/config/Makefile.am
examples/config/mailutils.schema
examples/echosrv.c
imap4d/idle.c
imap4d/imap4d.c
imap4d/imap4d.h
imap4d/preauth.c
imap4d/util.c
include/mailutils/gocs.h
include/mailutils/libargp.h
include/mailutils/libcfg.h
include/mailutils/locker.h
include/mailutils/server.h
include/mailutils/types.hin
lib/tcpwrap.c
--- a/ChangeLog
View file @5d286f5
+++ b/ChangeLog
View file @5d286f5
 2008-01-05  Sergey Poznyakoff  <gray@gnu.org.ua>
+	* NEWS: Update.
+	* mailbox/Makefile.am: Replace tcpsrv.c with ipsrv.c.
+	* mailbox/tcpsrv.c: Replace with ...
+	* mailbox/ipsrv.c: ... this file, which supports both TCP and UDP.
+	* mailbox/msrv.c: Use mu_ip_server_t.
+	* mailbox/server.c (mu_server_destroy): Bugfix.
+	* comsat/comsat.c, comsat/comsat.h: Use m-server.
+	* maidag/lmtp.c, maidag/maidag.h, pop3d/pop3d.c: Update to match
+	changed m-server types.
+	* include/mailutils/server.h (mu_tcp_*): Replace with mu_ip_*.
+	Add new prototypes.
+	* include/mailutils/types.hin: Likewise.
+	* lib/tcpwrap.c, lib/tcpwrap.h (mu_tcp_wrapper_prefork): Update
+	signature to match mu_m_server_prefork_fp.
+	* examples/echosrv.c: Use mu_ip_server_t
+	* imap4d/idle.c, imap4d/imap4d.c, imap4d/imap4d.h,
+	imap4d/preauth.c, imap4d/util.c: Remove mu_gocs_daemon.
+	* include/mailutils/gocs.h, include/mailutils/libargp.h,
+	include/mailutils/libargp.h, libargp/cmdline.c,
+	libargp/common.c, libcfg/common.c, libcfg/init.c,
+	mailbox/daemon.c, mailbox/gocs.c: Remove mu_gocs_daemon.
+	* mailbox/amd.c (amd_open): Provide a null-locker.
+	* include/mailutils/locker.h, mailbox/locker.c
+	(mu_locker_mod_flags): New function. 
+	* examples/config/mailutils.schema: LDAP schema for Mailutils.
+	* examples/config/Makefile.am: Add mailutils.schema
+	* dotlock/dotlock.c (main): Remove superfluous invocation of
+	mu_locker_set_flags.
+	* libproto/mbox/mbox.c (mbox_quick_get_message): Return
+	MU_ERR_NOENT if mailbox is empty.
+	* mailbox/tcpsrv.c (family_to_proto): Rename to
+	mu_address_family_to_domain.
+	* po/POTFILES.in: Update.
+	* pop3d/lock.c (pop3d_lock): use mu_locker_mod_flags, instead of
+	mu_locker_set_flags.
 	* include/mailutils/server.h (mu_m_server_prefork_fp): New
 	function type.
 	(mu_m_server_destroy, mu_m_server_set_prefork)
--- a/NEWS
View file @5d286f5
+++ b/NEWS
View file @5d286f5
-GNU mailutils NEWS -- history of user-visible changes. 2008-01-04
+GNU mailutils NEWS -- history of user-visible changes. 2008-01-05
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 See the end of file for copying conditions.
@@ -93,12 +93,13 @@ PREAUTH mode:
    DES encrypted replies are understood.
 3. prog - Imap4d invokes an external program to authenticate the
-    connection. Four arguments are supplied to the program:
+    connection. The command line is obtained from the supplied string,
+    by expandind the following variables:
-      1) Remote IP address in dotted-quad notation;
+      1) ${client_address} - Remote IP address in dotted-quad notation;
-      2) Remote port number;
+      2) ${client_port}    - Remote port number;
-      3) Local IP address (currently "0.0.0.0");
+      3) ${server_address} - Local IP address;
-      4) Local port number.
+      4) ${server_port}    - Local port number.
    If the connection is authenticated, the program should print the
    user name, followed by a newline character, on its standard
--- a/comsat/comsat.c
View file @5d286f5
+++ b/comsat/comsat.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2002, 2005, 
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -56,12 +56,18 @@ typedef struct utmp UTMP;
 const char *program_version = "comsatd (" PACKAGE_STRING ")";
 static char doc[] = "GNU comsatd";
+#define OPT_FOREGROUND 256
 static struct argp_option options[] = 
 {
  { "config", 'c', N_("FILE"), OPTION_HIDDEN, "", 0 },
  { "convert-config", 'C', N_("FILE"), 0,
    N_("Convert the configuration FILE to new format."), 0 },
  { "test", 't', NULL, 0, N_("Run in test mode"), 0 },
+  { "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), 0},
+  { "inetd",  'i', 0, 0, N_("Run in inetd mode"), 0 },
+  { "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
+    N_("Runs in daemon mode with a maximum of NUMBER children"), 0 },
  { NULL, 0, NULL, 0, NULL, 0 }
 };
@@ -78,7 +84,6 @@ static struct argp argp = {
 };
 static const char *comsat_argp_capa[] = {
-  "daemon",
  "common",
  "debug",
  "logging",
@@ -96,31 +101,21 @@ static const char *comsat_argp_capa[] = {
 # define MAXHOSTNAMELEN 64
 #endif
-struct mu_gocs_daemon default_gocs_daemon = {
-  MODE_INTERACTIVE,     /* Start in interactive (inetd) mode */
-  20,                   /* Default maximum number of children.
-			   Currently unused */
-  512,                  /* Default biff port */
-  0,                    /* Default timeout */
-};
 int maxlines = 5;
 char hostname[MAXHOSTNAMELEN];
 const char *username;
 int require_tty;
-mu_acl_t comsat_acl;
+mu_m_server_t server;
 static void comsat_init (void);
-static void comsat_daemon_init (void);
-static void comsat_daemon (int _port);
 static int comsat_main (int fd);
 static void notify_user (const char *user, const char *device,
 			 const char *path, mu_message_qid_t qid);
 static int find_user (const char *name, char *tty);
 static char *mailbox_path (const char *user);
-static void change_user (const char *user);
+static int change_user (const char *user);
-static int xargc;
+static int reload = 0;
-static char **xargv;
 int test_mode;
 struct mu_cfg_param comsat_cfg_param[] = {
@@ -142,13 +137,16 @@ struct mu_cfg_param comsat_cfg_param[] = {
  { "overflow-delay-time", mu_cfg_time, &overflow_delay_time,
    0, NULL,
    N_("Time to sleep after the first overflow occurs.") },
-  { "acl", mu_cfg_section, },
+  { ".server", mu_cfg_section, NULL, 0, NULL,
+    N_("Server configuration.") },
  { NULL }
 };
 static error_t
 comsatd_parse_opt (int key, char *arg, struct argp_state *state)
 {
+  static struct mu_argp_node_list lst;
  switch (key)
    {
    case 'c':
@@ -178,112 +176,43 @@ _("The old configuration file format and the --config command\n"
      convert_config (arg, stdout);
      exit (0);
+    case 'd':
+      mu_argp_node_list_new (&lst, "mode", "daemon");
+      if (arg)
+	mu_argp_node_list_new (&lst, "max-children", arg);
+      break;
+    case 'i':
+      mu_argp_node_list_new (&lst, "mode", "inetd");
+      break;
+    case OPT_FOREGROUND:
+      mu_argp_node_list_new (&lst, "foreground", "yes");
+      break;
    case 't':
      test_mode = 1;
      break;
+    case ARGP_KEY_INIT:
+      mu_argp_node_list_init (&lst);
+      break;
+    case ARGP_KEY_FINI:
+      mu_argp_node_list_finish (&lst, NULL, NULL);
+      break;
    default:
      return ARGP_ERR_UNKNOWN;
    }
  return 0;
 }
-int
-main (int argc, char **argv)
-{
-  int c;
-  int ind;
-  /* Native Language Support */
-  mu_init_nls ();
-  mu_argp_init (program_version, NULL);
-  mu_gocs_daemon = default_gocs_daemon;
-  comsat_init ();
-  mu_acl_cfg_init ();
-  if (mu_app_init (&argp, comsat_argp_capa, comsat_cfg_param, argc, argv, 0,
-		   &ind, &comsat_acl))
-    exit (1);
-  argc -= ind;
-  argv += ind;
-  if (test_mode)
-    {
-      char *user;
-      if (argc < 2 || argc > 2)
-	{
-	  mu_error (_("Mailbox URL and message QID are required in test mode"));
-	  exit (EXIT_FAILURE);
-	}
-      user = getenv ("LOGNAME");
-      if (!user)
-	{
-	  user = getenv ("USER");
-	  if (!user)
-	    {
-	      struct passwd *pw = getpwuid (getuid ());
-	      if (!pw)
-		{
-		  mu_error (_("Cannot determine user name"));
-		  exit (EXIT_FAILURE);
-		}
-	      user = pw->pw_name;
-	    }
-	}
-      notify_user (user, "/dev/tty", argv[0], argv[1]);
-      exit (0);
-    }
-  if (mu_gocs_daemon.timeout > 0 && mu_gocs_daemon.mode == MODE_DAEMON)
-    {
-      mu_error (_("--timeout and --daemon are incompatible"));
-      exit (EXIT_FAILURE);
-    }
-  if (mu_gocs_daemon.mode == MODE_DAEMON)
-    {
-      /* Preserve invocation arguments */
-      xargc = argc;
-      xargv = argv;
-      comsat_daemon_init ();
-    }
-  /* Set up error messaging  */
-  openlog ("gnu-comsat", LOG_PID, log_facility);
-  {
-    mu_debug_t debug;
-    mu_diag_get_debug (&debug);
-    mu_debug_set_print (debug, mu_diag_syslog_printer, NULL);
-  }
-  chdir ("/");
-  if (mu_gocs_daemon.mode == MODE_DAEMON)
-    comsat_daemon (mu_gocs_daemon.port);
-  else
-    c = comsat_main (0);
-  return c != 0;
-}
 static RETSIGTYPE
 sig_hup (int sig)
 {
-  mu_diag_output (MU_DIAG_NOTICE, _("Restarting"));
+  mu_m_server_stop (1);
+  reload = 1;
-  if (xargv[0][0] != '/')
-    mu_diag_output (MU_DIAG_ERROR, _("Cannot restart: program must be invoked using absolute pathname"));
-  else
-    execvp (xargv[0], xargv);
-  signal (sig, sig_hup);
 }
 void
@@ -300,21 +229,6 @@ comsat_init ()
  signal (SIGHUP, SIG_IGN);	/* Ignore SIGHUP.  */
 }
-/* Set up for daemon mode.  */
-static void
-comsat_daemon_init (void)
-{
-  extern int daemon (int, int);
-  /* Become a daemon. Take care to close inherited fds and to hold
-     first three ones, in, out, err.  Do not do the chdir("/").   */
-  if (daemon (1, 0) < 0)
-    {
-      perror (_("Failed to become a daemon"));
-      exit (EXIT_FAILURE);
-    }
-}
 int allow_biffrc = 1;            /* Allow per-user biffrc files */
 unsigned maxrequests = 16;       /* Maximum number of request allowed per
 			            control interval */
@@ -322,140 +236,40 @@ time_t request_control_interval = 10;  /* Request control interval */
 time_t overflow_control_interval = 10; /* Overflow control interval */
 time_t overflow_delay_time = 5;
 void
-comsat_daemon (int port)
+comsat_process (char *buffer, size_t rdlen)
 {
-  int fd;
+  char tty[MAX_TTY_SIZE];
-  struct sockaddr_in local_sin;
+  char *p;
-  time_t last_request_time;    /* Timestamp of the last received request */
+  char *path = NULL;
-  unsigned reqcount = 0;       /* Number of request received in the
+  mu_message_qid_t qid;
-				  current control interval */
-  time_t last_overflow_time;   /* Timestamp of last overflow */
-  unsigned overflow_count = 0; /* Number of overflows achieved during
-				  the current interval */
-  time_t now;
-  fd = socket (PF_INET, SOCK_DGRAM, 0);
+  /* Parse the buffer */
-  if (fd == -1)
+  p = strchr (buffer, '@');
+  if (!p)
    {
-      mu_diag_output (MU_DIAG_CRIT, "socket: %m");
+      mu_diag_output (MU_DIAG_ERROR, _("Malformed input: %s"), buffer);
-      exit (1);
+      return;
    }
+  *p++ = 0;
-  memset (&local_sin, 0, sizeof local_sin);
+  qid = p;
-  local_sin.sin_family = AF_INET;
+  p = strchr (qid, ':');
-  local_sin.sin_addr.s_addr = INADDR_ANY; /*FIXME*/
+  if (p)
-  local_sin.sin_port = htons (port);
-  if (bind (fd, (struct sockaddr *) &local_sin, sizeof local_sin) < 0)
    {
-      mu_diag_output (MU_DIAG_CRIT, "bind: %m");
+      *p++ = 0;
-      exit (1);
+      path = p;
    }
-  mu_diag_output (MU_DIAG_NOTICE, _("GNU comsat started"));
+  if (find_user (buffer, tty) != SUCCESS)
-  last_request_time = last_overflow_time = time (NULL);
-  while (1)
    {
-      fd_set fdset;
+      if (require_tty)
-      int rc;
+	return;
+      strcpy (tty, "/dev/null");
-      FD_ZERO (&fdset);
-      FD_SET (fd, &fdset);
-      rc = select (fd+1, &fdset, NULL, NULL, NULL);
-      if (rc == -1)
-	{
-	  if (errno != EINTR)
-	    mu_diag_output (MU_DIAG_ERROR, "select: %m");
-	  continue;
-	}
-      /* Control the request flow */
-      if (maxrequests != 0)
-	{
-	  now = time (NULL);
-	  if (reqcount > maxrequests)
-	    {
-	      unsigned delay;
-	      delay = overflow_delay_time << (overflow_count + 1);
-	      mu_diag_output (MU_DIAG_NOTICE,
-		      ngettext ("Too many requests: pausing for %u second",
-				"Too many requests: pausing for %u seconds",
-				delay),
-		      delay);
-	      sleep (delay);
-	      reqcount = 0;
-	      if (now - last_overflow_time <= overflow_control_interval)
-		{
-		  if ((overflow_delay_time << (overflow_count + 2)) >
-		      overflow_delay_time)
-		    ++overflow_count;
-		}
-	      else
-		overflow_count = 0;
-	      last_overflow_time = time (NULL);
-	    }
-	  if (now - last_request_time <= request_control_interval)
-	    reqcount++;
-	  else
-	    {
-	      last_request_time = now;
-	      reqcount = 1;
-	    }
-	}
-      comsat_main (fd);
    }
-}
-int
+  /* Child: do actual I/O */
-check_connection (int fd, struct sockaddr *addr, socklen_t addrlen)
+  notify_user (buffer, tty, path, qid);
-{
-  switch (addr->sa_family)
-    {
-    case PF_UNIX:
-      mu_diag_output (MU_DIAG_INFO, _("connect from socket"));
-      break;
-    case PF_INET:
-      {
-	struct sockaddr_in *s_in = (struct sockaddr_in *)addr;
-	if (comsat_acl)
-	  {
-	    mu_acl_result_t res;
-	    int rc = mu_acl_check_sockaddr (comsat_acl, addr, addrlen,
-					    &res);
-	    if (rc)
-	      {
-		mu_error (_("Access from %s blocked: cannot check ACLs: %s"),
-			  inet_ntoa (s_in->sin_addr), mu_strerror (rc));
-		return 1;
-	      }
-	    switch (res)
-	      {
-	      case mu_acl_result_undefined:
-		mu_diag_output (MU_DIAG_INFO,
-				_("%s: undefined ACL result; access allowed"),
-				inet_ntoa (s_in->sin_addr));
-		break;
-	      case mu_acl_result_accept:
-		break;
-	      case mu_acl_result_deny:
-		mu_error (_("Access from %s blocked."),
-			  inet_ntoa (s_in->sin_addr));
-		return 1;
-	      }
-	  }
-      }
-    }
-  return 0;
 }
 int
@@ -465,12 +279,7 @@ comsat_main (int fd)
  int len;
  struct sockaddr fromaddr;
  char buffer[216]; /*FIXME: Arbitrary size */
-  pid_t pid;
-  char tty[MAX_TTY_SIZE];
-  char *p;
-  char *path = NULL;
-  mu_message_qid_t qid;
  len = sizeof fromaddr;
  rdlen = recvfrom (fd, buffer, sizeof buffer, 0, &fromaddr, &len);
  if (rdlen <= 0)
@@ -480,66 +289,102 @@ comsat_main (int fd)
      mu_diag_output (MU_DIAG_ERROR, "recvfrom: %m");
      return 1;
    }
+  buffer[rdlen] = 0;
+  if (mu_m_server_check_acl (server, &fromaddr, len))
+    return 0;
-  if (check_connection (fd, &fromaddr, len))
+  comsat_process (buffer, rdlen);
-    return 1;
+  return 0;
+}
-  mu_diag_output (MU_DIAG_INFO,
+static time_t last_request_time;    /* Timestamp of the last received
-		  ngettext ("Received %d byte from %s",
+				       request */
-			    "Received %d bytes from %s", rdlen),
+static unsigned reqcount = 0;       /* Number of request received in the
-		  rdlen, inet_ntoa (((struct sockaddr_in*)&fromaddr)->sin_addr));
+				       current control interval */
+static time_t last_overflow_time;   /* Timestamp of last overflow */
-  buffer[rdlen] = 0;
+static unsigned overflow_count = 0; /* Number of overflows detected during
-  mu_diag_output (MU_DIAG_INFO, "string: %s", buffer);
+				       the current interval */
-  /* Parse the buffer */
+int
-  p = strchr (buffer, '@');
+comsat_prefork (int fd, void *data, struct sockaddr *s, int size)
-  if (!p)
+{
+  int retval = 0;
+  time_t now;
+  /* Control the request flow */
+  if (maxrequests != 0)
    {
-      mu_diag_output (MU_DIAG_ERROR, _("Malformed input: %s"), buffer);
+      now = time (NULL);
-      return 1;
+      if (reqcount > maxrequests)
-    }
+	{
-  *p++ = 0;
+	  unsigned delay;
+	  delay = overflow_delay_time << (overflow_count + 1);
+	  mu_diag_output (MU_DIAG_NOTICE,
+			 ngettext ("Too many requests: pausing for %u second",
+				   "Too many requests: pausing for %u seconds",
+				    delay),
+			  delay);
+	  /* FIXME: drain the socket? */
+	  sleep (delay);
+	  reqcount = 0;
+	  if (now - last_overflow_time <= overflow_control_interval)
+	    {
+	      if ((overflow_delay_time << (overflow_count + 2)) >
+		  overflow_delay_time)
+		++overflow_count;
+	    }
+	  else
+	    overflow_count = 0;
+	  last_overflow_time = time (NULL);
+	  retval = 1;
+	}
-  qid = p;
+      if (now - last_request_time <= request_control_interval)
-  p = strchr (qid, ':');
+	reqcount++;
-  if (p)
+      else
-    {
+	{
-      *p++ = 0;
+	  last_request_time = now;
-      path = p;
+	  reqcount = 1;
-    }
+	}
-  if (find_user (buffer, tty) != SUCCESS)
-    {
-      if (require_tty)
-	return 0;
-      strcpy (tty, "/dev/null");
    }
+  return retval;
+}
-  /* All I/O is done by child process. This is to avoid various blocking
+int
-     problems. */
+comsat_connection (int fd, struct sockaddr *sa, int salen,
+		   void *data, mu_ip_server_t srv,
-  pid = fork ();
+		   time_t to, int transcript)
+{
+  char *buffer;
+  size_t rdlen, size;
-  if (pid == -1)
+  if (mu_udp_server_get_rdata (srv, &buffer, &rdlen))
+    return 0;
+  if (transcript)
    {
-      mu_diag_output (MU_DIAG_ERROR, "fork: %m");
+      char *p = mu_sockaddr_to_astr (sa, salen);
-      return 1;
+      mu_diag_output (MU_DIAG_INFO,
+		      ngettext ("Received %d byte from %s",
+				"Received %d bytes from %s", rdlen),
+		      rdlen, p);
+      mu_diag_output (MU_DIAG_INFO, "string: %s", buffer);
+      free (p);
    }
+  mu_udp_server_get_bufsize (srv, &size);
-  if (pid > 0)
+  if (size < rdlen + 1)
    {
-      struct timeval tv;
+      int rc = mu_udp_server_set_bufsize (srv, rdlen + 1);
-      tv.tv_sec = 0;
+      if (rc)
-      tv.tv_usec = 100000;
+	{
-      select (0, NULL, NULL, NULL, &tv);
+	  mu_error (_("Cannot resize buffer: %s"), mu_strerror (rc));
-      kill (pid, SIGKILL); /* Just in case the child is hung */
+	  return 0;
-      return 0;
+	}
    }
+  buffer[rdlen] = 0;
-  /* Child: do actual I/O */
+  comsat_process (buffer, rdlen);
-  notify_user (buffer, tty, path, qid);
+  return 0;
-  exit (0);
 }
 static const char *
@@ -570,11 +415,12 @@ notify_user (const char *user, const char *device, const char *path,
  mu_message_t msg;
  int status;
-  change_user (user);
+  if (change_user (user))
+    return;
  if ((fp = fopen (device, "w")) == NULL)
    {
      mu_error (_("Cannot open device %s: %m"), device);
-      exit (0);
+      return;
    }
  cr = get_newline_str (fp);
@@ -672,7 +518,7 @@ find_user (const char *name, char *tty)
  return status;
 }
-void
+int
 change_user (const char *user)
 {
  struct passwd *pw;
@@ -681,13 +527,14 @@ change_user (const char *user)
  if (!pw)
    {
      mu_diag_output (MU_DIAG_CRIT, _("No such user: %s"), user);
-      exit (1);
+      return 1;
    }
  setgid (pw->pw_gid);
  setuid (pw->pw_uid);
  chdir (pw->pw_dir);
  username = user;
+  return 0;
 }
 char *
@@ -709,3 +556,111 @@ mailbox_path (const char *user)
  return mailbox_name;
 }
+int
+main (int argc, char **argv)
+{
+  int c;
+  int ind;
+  /* Native Language Support */
+  mu_init_nls ();
+  mu_argp_init (program_version, NULL);
+  comsat_init ();
+  mu_acl_cfg_init ();
+  mu_m_server_cfg_init ();
+  mu_m_server_create (&server, "GNU comsat");
+  mu_m_server_set_type (server, MU_IP_UDP);
+  mu_m_server_set_conn (server, comsat_connection);
+  mu_m_server_set_prefork (server, comsat_prefork);
+  mu_m_server_set_mode (server, MODE_INTERACTIVE);
+  mu_m_server_set_max_children (server, 20);
+  /* FIXME mu_m_server_set_pidfile (); */
+  mu_m_server_set_default_port (server, 512);
+  /* FIXME: timeout is not needed. How to disable it? */
+  if (mu_app_init (&argp, comsat_argp_capa, comsat_cfg_param, argc, argv, 0,
+		   &ind, server))
+    exit (1);
+  if (test_mode)
+    {
+      char *user;
+      argc -= ind;
+      argv += ind;
+      if (argc < 2 || argc > 2)
+	{
+	  mu_error (_("Mailbox URL and message QID are required in test mode"));
+	  exit (EXIT_FAILURE);
+	}
+      user = getenv ("LOGNAME");
+      if (!user)
+	{
+	  user = getenv ("USER");
+	  if (!user)
+	    {
+	      struct passwd *pw = getpwuid (getuid ());
+	      if (!pw)
+		{
+		  mu_error (_("Cannot determine user name"));
+		  exit (EXIT_FAILURE);
+		}
+	      user = pw->pw_name;
+	    }
+	}
+      notify_user (user, "/dev/tty", argv[0], argv[1]);
+      exit (0);
+    }
+  /* Set up error messaging  */
+  openlog ("gnu-comsat", LOG_PID, log_facility);
+  {
+    mu_debug_t debug;
+    mu_diag_get_debug (&debug);
+    mu_debug_set_print (debug, mu_diag_syslog_printer, NULL);
+    mu_debug_default_printer = mu_debug_syslog_printer;
+  }
+  if (mu_m_server_mode (server) == MODE_DAEMON)
+    {
+      if (argv[0][0] != '/')
+	mu_diag_output (MU_DIAG_NOTICE,
+			_("Program name is not absolute; reloading will not "
+			  "be possible"));
+      else
+	{
+	  sigset_t set;
+	  mu_m_server_get_sigset (server, &set);
+	  sigdelset (&set, SIGHUP);
+	  mu_m_server_set_sigset (server, &set);
+	  signal (SIGHUP, sig_hup);
+	}
+      mu_m_server_begin (server);
+      c = mu_m_server_run (server);
+      mu_m_server_end (server);
+      mu_m_server_destroy (&server);
+      if (reload)
+	{
+	  mu_diag_output (MU_DIAG_NOTICE, _("Restarting"));
+	  execvp (argv[0], argv);
+	}
+    }
+  else
+    {
+      chdir ("/");
+      c = comsat_main (0);
+    }
+  return c != 0;
+}
--- a/comsat/comsat.h
View file @5d286f5
+++ b/comsat/comsat.h
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2007, 
+   2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -61,6 +62,7 @@
 #include <mailutils/nls.h>
 #include <mailutils/daemon.h>
 #include <mailutils/acl.h>
+#include <mailutils/server.h>
 #ifndef INADDR_NONE
 # define INADDR_NONE -1
--- a/dotlock/dotlock.c
View file @5d286f5
+++ b/dotlock/dotlock.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2002, 2005, 
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -182,8 +182,6 @@ main (int argc, char *argv[])
      return MU_DL_EX_ERROR;
    }
-  mu_locker_set_flags (locker, flags);
  if (force != 0)
    mu_locker_set_expire_time (locker, force);
--- a/examples/config/Makefile.am
View file @5d286f5
+++ b/examples/config/Makefile.am
View file @5d286f5
 ## Process this file with GNU Automake to create Makefile.in
-##   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+##   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -21,5 +21,6 @@ EXTRA_DIST = \
 dot.biffrc\
 gnu-imap4d.pam\
 gnu-pop3d.pam\
- mailutils.dict
+ mailutils.dict\
+ mailutils.schema
--- a/examples/config/mailutils.schema 0 → 100644
View file @5d286f5
+++ b/examples/config/mailutils.schema 0 → 100644
View file @5d286f5
+# This file is part of GNU Mailutils -- a suite of utilities for electronic
+# mail
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+#
+# GNU Mailutils 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 3, or (at your option)
+# any later version.
+#
+# GNU Mailutils 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, see <http://www.gnu.org/licenses/>.
+attributetype ( 1.3.6.1.4.1.11591.4.1.0 NAME 'mu-mailBox'
+	DESC 'The URL of the user mail box'
+	EQUALITY caseExactIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+attributetype ( 1.3.6.1.4.1.11591.4.1.1 NAME 'mu-mailQuota'
+	DESC 'Maximum allowed size of the user mailbox'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+# Object Class Definitions
+objectclass ( 1.3.6.1.4.1.11591.4.2.0 NAME 'mailutilsAccount'
+	DESC 'Abstraction of an account with Mailutils attributes'
+	SUP posixAccount AUXILIARY
+	MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory )
+	MAY ( userPassword $ loginShell $ gecos $ mu-mailBox $ mu-mailQuota ) )
--- a/examples/echosrv.c
View file @5d286f5
+++ b/examples/echosrv.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -37,7 +37,7 @@ mu_server_t server;
 int
 echo_conn (int fd, struct sockaddr *s, int len,
 	   void *server_data, void *call_data,
-	   mu_tcp_server_t srv)
+	   mu_ip_server_t srv)
 {
  struct sockaddr_in srv_addr, *s_in = (struct sockaddr_in *)s;
  int addrlen = sizeof srv_addr;
@@ -45,7 +45,7 @@ echo_conn (int fd, struct sockaddr *s, int len,
  char buf[512];
  FILE *in, *out;
-  mu_tcp_server_get_sockaddr (srv, (struct sockaddr *)&srv_addr, &addrlen);
+  mu_ip_server_get_sockaddr (srv, (struct sockaddr *)&srv_addr, &addrlen);
  pid = fork ();
  if (pid == -1)
@@ -63,7 +63,7 @@ echo_conn (int fd, struct sockaddr *s, int len,
      return 0;
    }
-  mu_tcp_server_shutdown (srv);
+  mu_ip_server_shutdown (srv);
  in = fdopen (fd, "r");
  out = fdopen (fd, "w");
@@ -88,11 +88,11 @@ echo_conn (int fd, struct sockaddr *s, int len,
 int
 tcp_conn_handler (int fd, void *conn_data, void *server_data)
 {
-  mu_tcp_server_t tcpsrv = (mu_tcp_server_t) conn_data;
+  mu_ip_server_t tcpsrv = (mu_ip_server_t) conn_data;
-  int rc = mu_tcp_server_accept (tcpsrv, server_data);
+  int rc = mu_ip_server_accept (tcpsrv, server_data);
  if (rc && rc != EINTR)
    {
-      mu_tcp_server_shutdown (tcpsrv);
+      mu_ip_server_shutdown (tcpsrv);
      return MU_SERVER_CLOSE_CONN;
    }
  return MU_SERVER_SUCCESS;
@@ -101,8 +101,8 @@ tcp_conn_handler (int fd, void *conn_data, void *server_data)
 void
 tcp_conn_free (void *conn_data, void *server_data)
 {
-  mu_tcp_server_t tcpsrv = (mu_tcp_server_t) conn_data;
+  mu_ip_server_t tcpsrv = (mu_ip_server_t) conn_data;
-  mu_tcp_server_destroy (&tcpsrv);
+  mu_ip_server_destroy (&tcpsrv);
 }
 void
@@ -110,7 +110,7 @@ create_server (char *arg)
 {
  char *p, *q;
  struct sockaddr_in s;
-  mu_tcp_server_t tcpsrv;
+  mu_ip_server_t tcpsrv;
  unsigned n;
  p = strchr (arg, ':');
@@ -134,11 +134,12 @@ create_server (char *arg)
    }      
  s.sin_port = htons (n);
-  MU_ASSERT (mu_tcp_server_create (&tcpsrv, (struct sockaddr*) &s, sizeof s));
+  MU_ASSERT (mu_ip_server_create (&tcpsrv, (struct sockaddr*) &s, sizeof s,
-  MU_ASSERT (mu_tcp_server_open (tcpsrv));
+				  MU_IP_TCP));
-  MU_ASSERT (mu_tcp_server_set_conn (tcpsrv, echo_conn));
+  MU_ASSERT (mu_ip_server_open (tcpsrv));
+  MU_ASSERT (mu_ip_server_set_conn (tcpsrv, echo_conn));
  MU_ASSERT (mu_server_add_connection (server,
-				       mu_tcp_server_get_fd (tcpsrv),
+				       mu_ip_server_get_fd (tcpsrv),
 				       tcpsrv,
 				       tcp_conn_handler, tcp_conn_free));
 }
--- a/imap4d/idle.c
View file @5d286f5
+++ b/imap4d/idle.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ imap4d_idle (struct imap4d_command *command, char *arg)
 	  if (rc)
 	    break;
 	}
-      else if (time (NULL) - start > mu_gocs_daemon.timeout)
+      else if (time (NULL) - start > idle_timeout)
 	imap4d_bye (ERR_TIMEOUT);
      imap4d_sync ();
--- a/imap4d/imap4d.c
View file @5d286f5
+++ b/imap4d/imap4d.c
View file @5d286f5
@@ -371,7 +371,6 @@ static int
 imap4d_mainloop (int fd, FILE *infile, FILE *outfile)
 {
  char *text;
-  struct sockaddr_in cs;
  int debug_mode = isatty (fd);
  /* Reset hup to exit. */
@@ -416,7 +415,8 @@ imap4d_mainloop (int fd, FILE *infile, FILE *outfile)
 }
 int
-imap4d_connection (int fd, void *data, time_t timeout, int transcript)
+imap4d_connection (int fd, struct sockaddr *sa, int salen, void *data,
+		   mu_ip_server_t srv, time_t timeout, int transcript)
 {
  idle_timeout = timeout;
  imap4d_transcript = transcript;
--- a/imap4d/imap4d.h
View file @5d286f5
+++ b/imap4d/imap4d.h
View file @5d286f5
@@ -182,7 +182,9 @@ extern int preauth_only;
 extern int ident_port;
 extern char *ident_keyfile;
 extern int ident_encrypt_only;
+extern unsigned int idle_timeout;
+extern int imap4d_transcript;
 #ifndef HAVE_STRTOK_R
 extern char *strtok_r (char *s, const char *delim, char **save_ptr);
 #endif
--- a/imap4d/preauth.c
View file @5d286f5
+++ b/imap4d/preauth.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2001, 2002, 2003, 2004, 
-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,13 +20,14 @@
 /* Preauth support for imap4d */
 #include "imap4d.h"
+#include <mailutils/vartab.h>
 #include "des.h"
 /* Stdio preauth */
 static char *
-do_preauth_stdio (struct sockaddr_in *pcs)
+do_preauth_stdio ()
 {
  struct passwd *pw = getpwuid (getuid ());
  return pw ? strdup (pw->pw_name) : NULL;
@@ -321,15 +322,32 @@ ident_decrypt (const char *file, const char *name)
 }
 static char *
-do_preauth_ident (struct sockaddr_in *pcs)
+do_preauth_ident (struct sockaddr *clt_sa, struct sockaddr *srv_sa)
 {
  mu_stream_t stream;
  char hostaddr[16];
-  char *p = inet_ntoa (pcs->sin_addr);
  int rc;
  char *buf = NULL;
  size_t size = 0;
  char *name = NULL;
+  struct sockaddr_in *srv_addr, *clt_addr;
+  char *p;
+  if (!srv_sa || !clt_sa)
+    {
+      mu_diag_output (MU_DIAG_ERROR, _("Not enough data for IDENT preauth"));
+      return NULL;
+    }
+  if (srv_sa->sa_family != AF_INET)
+    {
+      mu_diag_output (MU_DIAG_ERROR,
+		      _("Invalid socket family (%d) IDENT preauth"),
+		      srv_sa->sa_family);
+      return NULL;
+    }
+  srv_addr = (struct sockaddr_in *) srv_sa;
+  clt_addr = (struct sockaddr_in *) clt_sa;
+  p = inet_ntoa (clt_addr->sin_addr);
  memcpy (hostaddr, p, 15);
  hostaddr[15] = 0;
@@ -350,8 +368,9 @@ do_preauth_ident (struct sockaddr_in *pcs)
      return NULL;
    }
-  mu_stream_sequential_printf (stream, "%u , %u\r\n", ntohs (pcs->sin_port),
+  mu_stream_sequential_printf (stream, "%u , %u\r\n",
-			       mu_gocs_daemon.port);
+			       ntohs (clt_addr->sin_port),
+			       ntohs (srv_addr->sin_port));
  mu_stream_shutdown (stream, MU_STREAM_WRITE);
  rc = mu_stream_sequential_getline (stream, &buf, &size, NULL);
@@ -402,21 +421,35 @@ do_preauth_ident (struct sockaddr_in *pcs)
 /* External (program) preauth */
 static char *
-do_preauth_program (struct sockaddr_in *pcs)
+do_preauth_program (struct sockaddr *pcs, struct sockaddr *sa)
 {
+  int rc;
+  mu_vartab_t vtab;
+  char *cmd;
  FILE *fp;
-  char *p = inet_ntoa (pcs->sin_addr);
-  char *cmd = 0;
  char *buf = NULL;
-  size_t size;
+  size_t size = 0;
-  ssize_t rc;
+  mu_vartab_create (&vtab);
-  asprintf (&cmd, "%s %s %u %s %u",
+  if (pcs && pcs->sa_family == AF_INET)
-	    preauth_program,
+    {
-	    p,
+      struct sockaddr_in *s_in = (struct sockaddr_in *)pcs;
-	    ntohs (pcs->sin_port),
+      mu_vartab_define (vtab, "client_address", inet_ntoa (s_in->sin_addr), 0);
-	    "0.0.0.0", /* FIXME */
+      mu_vartab_define (vtab, "client_port",
-	    mu_gocs_daemon.port);
+			mu_umaxtostr (0, ntohs (s_in->sin_port)), 0);
+    }
+  if (sa && sa->sa_family == AF_INET)
+    {
+      struct sockaddr_in *s_in = (struct sockaddr_in *) sa;
+      mu_vartab_define (vtab, "server_address", inet_ntoa (s_in->sin_addr), 0);
+      mu_vartab_define (vtab, "server_port",
+			mu_umaxtostr (0, ntohs (s_in->sin_port)), 0);
+    }
+  rc = mu_vartab_expand (vtab, preauth_program, &cmd);
+  mu_vartab_destroy (&vtab);
+  if (rc)
+    return NULL;
  fp = popen (cmd, "r");
  free (cmd);
  rc = getline (&buf, &size, fp);
@@ -436,14 +469,30 @@ do_preauth_program (struct sockaddr_in *pcs)
 int
 imap4d_preauth_setup (int fd)
 {
-  struct sockaddr_in cs;
+  struct sockaddr clt_sa, *pclt_sa; 
-  int len = sizeof cs;
+  int clt_len = sizeof clt_sa;
+  struct sockaddr srv_sa, *psrv_sa;
+  int srv_len = sizeof srv_sa;
  char *username = NULL;
-  if (getpeername (fd, (struct sockaddr *) &cs, &len) < 0)
+  if (getsockname (fd, &srv_sa, &srv_len) == -1)
-    mu_diag_output (MU_DIAG_ERROR,
+    {
-		    _("Cannot obtain IP address of client: %s"),
+      psrv_sa = NULL;
-		    strerror (errno));
+      srv_len = 0;
+    }
+  else
+    psrv_sa = &srv_sa;
+  if (getpeername (fd, (struct sockaddr *) &clt_sa, &clt_len) == -1)
+    {
+      mu_diag_output (MU_DIAG_ERROR,
+		      _("Cannot obtain IP address of client: %s"),
+		      strerror (errno));
+      pclt_sa = NULL;
+      clt_len = 0;
+    }
+  else
+    pclt_sa = &clt_sa;
  auth_data = NULL;
  switch (preauth_mode)
@@ -452,15 +501,15 @@ imap4d_preauth_setup (int fd)
      return 0;
    case preauth_stdio:
-      username = do_preauth_stdio (&cs);
+      username = do_preauth_stdio ();
      break;
    case preauth_ident:
-      username = do_preauth_ident (&cs);
+      username = do_preauth_ident (pclt_sa, psrv_sa);
      break;
    case preauth_prog:
-      username = do_preauth_program (&cs);
+      username = do_preauth_program (pclt_sa, psrv_sa);
      break;
    }
--- a/imap4d/util.c
View file @5d286f5
+++ b/imap4d/util.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2001, 2002, 2003, 2004, 
-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -360,7 +360,7 @@ util_send (const char *format, ...)
  if (!buf)
      imap4d_bye (ERR_NO_MEM);
-  if (mu_gocs_daemon.transcript)
+  if (imap4d_transcript)
    mu_diag_output (MU_DIAG_DEBUG, "sent: %s", buf);
  status = mu_stream_sequential_write (ostream, buf, strlen (buf));
@@ -414,7 +414,7 @@ util_out (int rc, const char *format, ...)
  if (!buf)
    imap4d_bye (ERR_NO_MEM);
-  if (mu_gocs_daemon.transcript)
+  if (imap4d_transcript)
    mu_diag_output (MU_DIAG_DEBUG, "sent: %s", buf);
  status = mu_stream_sequential_write (ostream, buf, strlen (buf));
@@ -455,7 +455,7 @@ util_finish (struct imap4d_command *command, int rc, const char *format, ...)
  strcat (buf, tempbuf);
  free (tempbuf);
-  if (mu_gocs_daemon.transcript)
+  if (imap4d_transcript)
    mu_diag_output (MU_DIAG_DEBUG, "sent: %s\r\n", buf);
  mu_stream_sequential_write (ostream, buf, strlen (buf));
@@ -503,7 +503,7 @@ imap4d_readline (void)
      size_t sz;
      int rc;
-      alarm (mu_gocs_daemon.timeout);
+      alarm (idle_timeout);
      rc = mu_stream_sequential_readline (istream, buffer, sizeof (buffer), &sz);
      if (sz == 0)
 	{
@@ -577,7 +577,7 @@ imap4d_readline (void)
 	}
    }
  while (number > 0 || (total && line[total - 1] != '\n'));
-  if (mu_gocs_daemon.transcript)
+  if (imap4d_transcript)
    mu_diag_output (MU_DIAG_DEBUG, "recv: %s", line);
  return line;
 }
@@ -1035,7 +1035,7 @@ util_localname ()
 #define WILD_ABORT 2
 int
-_wild_match (const char *expr, const char *name, const char *delim)
+_wild_match (const char *expr, const char *name, char delim)
 {
  while (expr && *expr)
    {
--- a/include/mailutils/gocs.h
View file @5d286f5
+++ b/include/mailutils/gocs.h
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -26,16 +26,6 @@
 extern "C" { 
 #endif
-struct mu_gocs_daemon
-{
-  int mode;
-  size_t maxchildren;
-  unsigned int port;
-  unsigned int timeout;
-  int transcript;
-  char *pidfile;
-};
 struct mu_gocs_logging
 {
  int facility;
@@ -104,7 +94,6 @@ int mu_gocs_enumerate (mu_list_action_t action, void *data);
 int mu_gocs_mailbox_init (void *data);
 int mu_gocs_locking_init (void *data);
-int mu_gocs_daemon_init (void *data);
 int mu_gocs_source_email_init (void *data);
 int mu_gocs_mailer_init (void *data);
 int mu_gocs_logging_init (void *data);
--- a/include/mailutils/libargp.h
View file @5d286f5
+++ b/include/mailutils/libargp.h
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2004, 2005,
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -52,7 +52,6 @@ extern struct mu_cmdline_capa mu_mailbox_cmdline;
 extern struct mu_cmdline_capa mu_locking_cmdline;
 extern struct mu_cmdline_capa mu_address_cmdline;
 extern struct mu_cmdline_capa mu_mailer_cmdline;
-extern struct mu_cmdline_capa mu_daemon_cmdline;
 extern struct mu_cmdline_capa mu_sieve_cmdline;
 extern struct mu_cmdline_capa mu_debug_cmdline;
--- a/include/mailutils/libcfg.h
View file @5d286f5
+++ b/include/mailutils/libcfg.h
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -96,7 +96,6 @@ extern struct mu_cfg_capa mu_sql_cfg_capa;
 extern struct mu_cfg_capa mu_tls_cfg_capa;
 extern struct mu_cfg_capa mu_virtdomain_cfg_capa;
 extern struct mu_cfg_capa mu_sieve_cfg_capa;
-extern struct mu_cfg_capa mu_daemon_cfg_capa;
 extern struct mu_cfg_capa mu_auth_cfg_capa;
 extern struct mu_cfg_capa mu_ldap_cfg_capa;
--- a/include/mailutils/locker.h
View file @5d286f5
+++ b/include/mailutils/locker.h
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2005, 2007, 
+   2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -112,6 +113,8 @@ extern void mu_locker_destroy (mu_locker_t *);
 /* Time is measured in seconds. */
 extern int mu_locker_set_flags (mu_locker_t, int);
+extern int mu_locker_mod_flags (mu_locker_t locker, int flags,
+				enum mu_locker_set_mode mode);
 extern int mu_locker_set_expire_time (mu_locker_t, int);
 extern int mu_locker_set_retries (mu_locker_t, int);
 extern int mu_locker_set_retry_sleep (mu_locker_t, int);
--- a/include/mailutils/server.h
View file @5d286f5
+++ b/include/mailutils/server.h
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -43,42 +43,57 @@ int mu_server_set_timeout (mu_server_t srv, struct timeval *to);
 int mu_server_count (mu_server_t srv, size_t *pcount);
-/* TCP server */
+/* IP (TCP and UDP) server */
 struct sockaddr;
-typedef int (*mu_tcp_server_conn_fp) (int fd, struct sockaddr *s, int len,
+typedef int (*mu_ip_server_conn_fp) (int fd, struct sockaddr *s, int len,
-				      void *server_data, void *call_data,
+				     void *server_data, void *call_data,
-				      mu_tcp_server_t srv);
+				     mu_ip_server_t srv);
-typedef int (*mu_tcp_server_intr_fp) (void *data, void *call_data);
+typedef int (*mu_ip_server_intr_fp) (void *data, void *call_data);
-typedef void (*mu_tcp_server_free_fp) (void *data);
+typedef void (*mu_ip_server_free_fp) (void *data);
+#define MU_IP_TCP 0
-int mu_tcp_server_create (mu_tcp_server_t *psrv, struct sockaddr *addr,
+#define MU_IP_UDP 1
-			  int len);
-int mu_tcp_server_destroy (mu_tcp_server_t *psrv);
+int mu_ip_server_create (mu_ip_server_t *psrv, struct sockaddr *addr,
-int mu_tcp_server_set_debug (mu_tcp_server_t srv, mu_debug_t debug);
+			 int len, int type);
-int mu_tcp_server_get_debug (mu_tcp_server_t srv, mu_debug_t *pdebug);
+int mu_ip_server_destroy (mu_ip_server_t *psrv);
-int mu_tcp_server_set_backlog (mu_tcp_server_t srv, int backlog);
+int mu_ip_server_get_type (mu_ip_server_t srv, int *ptype);
-int mu_tcp_server_set_ident (mu_tcp_server_t srv, const char *ident);
+int mu_ip_server_set_debug (mu_ip_server_t srv, mu_debug_t debug);
-int mu_tcp_server_set_acl (mu_tcp_server_t srv, mu_acl_t acl);
+int mu_ip_server_get_debug (mu_ip_server_t srv, mu_debug_t *pdebug);
-int mu_tcp_server_set_conn (mu_tcp_server_t srv, mu_tcp_server_conn_fp conn);
+int mu_ip_server_set_ident (mu_ip_server_t srv, const char *ident);
-int mu_tcp_server_set_intr (mu_tcp_server_t srv, mu_tcp_server_intr_fp intr);
+int mu_ip_server_set_acl (mu_ip_server_t srv, mu_acl_t acl);
-int mu_tcp_server_set_data (mu_tcp_server_t srv,
+int mu_ip_server_set_conn (mu_ip_server_t srv, mu_ip_server_conn_fp conn);
-			    void *data, mu_tcp_server_free_fp free);
+int mu_ip_server_set_intr (mu_ip_server_t srv, mu_ip_server_intr_fp intr);
-int mu_tcp_server_open (mu_tcp_server_t srv);
+int mu_ip_server_set_data (mu_ip_server_t srv,
-int mu_tcp_server_shutdown (mu_tcp_server_t srv);
+			    void *data, mu_ip_server_free_fp free);
-int mu_tcp_server_accept (mu_tcp_server_t srv, void *call_data);
+int mu_ip_server_open (mu_ip_server_t srv);
-int mu_tcp_server_loop (mu_tcp_server_t srv, void *call_data);
+int mu_ip_server_shutdown (mu_ip_server_t srv);
-int mu_tcp_server_get_fd (mu_tcp_server_t srv);
+int mu_ip_server_accept (mu_ip_server_t srv, void *call_data);
-int mu_tcp_server_get_sockaddr (mu_tcp_server_t srv, struct sockaddr *s,
+int mu_ip_server_loop (mu_ip_server_t srv, void *call_data);
-				int *size);
+int mu_ip_server_get_fd (mu_ip_server_t srv);
+int mu_ip_server_get_sockaddr (mu_ip_server_t srv, struct sockaddr *s,
+			       int *size);
+int mu_tcp_server_set_backlog (mu_ip_server_t srv, int backlog);
+int mu_udp_server_set_bufsize (mu_ip_server_t srv, size_t size);
+int mu_udp_server_get_bufsize (mu_ip_server_t srv, size_t *psize);
+int mu_udp_server_get_rdata (mu_ip_server_t srv, char **pbuf,
+			     size_t *pbufsize);
 /* m-server */
-typedef int (*mu_m_server_conn_fp) (int, void *, time_t, int);
+typedef struct mu_m_server_connect_data mu_m_server_connect_data_t;
-typedef int (*mu_m_server_prefork_fp) (int, struct sockaddr *s, int size);
+typedef int (*mu_m_server_conn_fp) (int fd, struct sockaddr *sa, int salen,
+				    void *data, mu_ip_server_t srv,
+				    time_t timeout, int transcript);
+typedef int (*mu_m_server_prefork_fp) (int, void *,
+				       struct sockaddr *s, int size);
 void mu_m_server_create (mu_m_server_t *psrv, const char *ident);
 void mu_m_server_destroy (mu_m_server_t *pmsrv);
 void mu_m_server_set_mode (mu_m_server_t srv, int mode);
+void mu_m_server_set_type (mu_m_server_t srv, int type);
+void mu_m_server_get_type (mu_m_server_t srv, int *ptype);
 void mu_m_server_set_conn (mu_m_server_t srv, mu_m_server_conn_fp f);
 void mu_m_server_set_prefork (mu_m_server_t srv, mu_m_server_prefork_fp fun);
 void mu_m_server_set_data (mu_m_server_t srv, void *data);
@@ -99,6 +114,9 @@ void mu_m_server_begin (mu_m_server_t msrv);
 int mu_m_server_run (mu_m_server_t msrv);
 void mu_m_server_end (mu_m_server_t msrv);
+void mu_m_server_stop (int code);
+int mu_m_server_check_acl (mu_m_server_t msrv, struct sockaddr *s, int salen);
 void mu_m_server_cfg_init (void);
--- a/include/mailutils/types.hin
View file @5d286f5
+++ b/include/mailutils/types.hin
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail  -*- c -*-
-   Copyright (C) 1999, 2000, 2001, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2005, 2007, 
+   2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -107,7 +108,7 @@ typedef char *mu_message_qid_t;
 typedef int mu_log_level_t;
 typedef struct _mu_acl *mu_acl_t;
 typedef struct _mu_server *mu_server_t;
-typedef struct _mu_tcp_server *mu_tcp_server_t;
+typedef struct _mu_ip_server *mu_ip_server_t;
 typedef struct _mu_m_server *mu_m_server_t;
 #define MU_FOLDER_ATTRIBUTE_DIRECTORY 0x001
--- a/lib/tcpwrap.c
View file @5d286f5
+++ b/lib/tcpwrap.c
View file @5d286f5
@@ -142,7 +142,7 @@ mu_tcpwrapper_access (int fd)
 #endif
 int
-mu_tcp_wrapper_prefork (int fd, struct sockaddr *sa, int salen)
+mu_tcp_wrapper_prefork (int fd, void *data, struct sockaddr *sa, int salen)
 {
  if (mu_tcp_wrapper_enable && !mu_tcpwrapper_access (fd))
    {
--- a/lib/tcpwrap.h
View file @5d286f5
+++ b/lib/tcpwrap.h
View file @5d286f5
@@ -31,7 +31,8 @@ extern int mu_tcp_wrapper_cb_hosts_deny_syslog (mu_debug_t debug, void *data,
 						char *arg);
 extern int mu_tcpwrapper_access (int fd);
 extern void mu_tcpwrapper_cfg_init (void);
-extern int mu_tcp_wrapper_prefork (int fd, struct sockaddr *sa, int salen);
+extern int mu_tcp_wrapper_prefork (int fd, void *data,
+				   struct sockaddr *sa, int salen);
 #ifdef WITH_LIBWRAP
 # define TCP_WRAPPERS_CONFIG { "tcp-wrappers", mu_cfg_section },
--- a/libargp/cmdline.c
View file @5d286f5
+++ b/libargp/cmdline.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,6 @@ static struct mu_cmdline_capa *all_cmdline_capa[] = {
  &mu_locking_cmdline,
  &mu_address_cmdline,
  &mu_mailer_cmdline,
-  &mu_daemon_cmdline,
  &mu_debug_cmdline,
  &mu_pam_cmdline,
  &mu_gsasl_cmdline,
--- a/libargp/common.c
View file @5d286f5
+++ b/libargp/common.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,6 @@
 #include "cmdline.h"
 #include <string.h>
 #include <mailutils/syslog.h>
-#include <mailutils/daemon.h>
 #include <mailutils/mailbox.h>
@@ -488,91 +487,6 @@ struct mu_cmdline_capa mu_mailer_cmdline = {
 };
-/* ************************************************************************* */
-/* Daemon                                                                    */
-/* ************************************************************************* */
-/* Options used by programs that become daemons. */
-static struct argp_option mu_daemon_argp_option[] = {
-  {"daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
-   N_("Runs in daemon mode with a maximum of NUMBER children")},
-  {"inetd",  'i', 0, 0,
-   N_("Run in inetd mode"), 0},
-  {"port", 'p', N_("PORT"), 0,
-   N_("Listen on specified port number"), 0},
-  {"timeout", 't', N_("NUMBER"), OPTION_HIDDEN,
-   N_("Set idle timeout value to NUMBER seconds"), 0},
-  {"transcript", 'x', NULL, 0,
-   N_("Output session transcript via syslog"), 0},
-  {"pidfile", 'P', N_("FILE"), OPTION_HIDDEN,
-   N_("Set PID file"), 0},
-  { NULL,      0, NULL, 0, NULL, 0 }
-};
-static error_t
-mu_daemon_argp_parser (int key, char *arg, struct argp_state *state)
-{
-  static struct mu_argp_node_list lst;
-  switch (key)
-    {
-    case 'd':
-      mu_argp_node_list_new (&lst, "mode", "daemon");
-      if (arg)
-	mu_argp_node_list_new (&lst, "max-children", arg);
-      break;
-    case 'i':
-      mu_argp_node_list_new (&lst, "mode", "inetd");
-      break;
-    case 'p':
-      mu_argp_node_list_new (&lst, "port", arg);
-      break;
-    case 'P':
-      mu_argp_node_list_new (&lst, "pidfile", arg);
-      break;
-    case 't':
-      mu_argp_node_list_new (&lst, "timeout", arg);
-      break;
-    case 'x':
-      mu_argp_node_list_new (&lst, "transcript", "yes");
-      break;
-    case ARGP_KEY_INIT:
-      mu_argp_node_list_init (&lst);
-      break;
-    case ARGP_KEY_FINI:
-      mu_argp_node_list_finish (&lst, "daemon", NULL);
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-struct argp mu_daemon_argp = {
-  mu_daemon_argp_option,
-  mu_daemon_argp_parser,
-};
-struct argp_child mu_daemon_argp_child = {
-  &mu_daemon_argp,
-  0,
-  N_("Daemon configuration options"),
-  0
-};
-struct mu_cmdline_capa mu_daemon_cmdline = {
-  "daemon", &mu_daemon_argp_child
-};
 static struct argp_option mu_debug_argp_options[] = 
 {
  { "debug-level", OPT_DEBUG_LEVEL, N_("LEVEL"), 0,
@@ -590,7 +504,8 @@ mu_debug_argp_parser (int key, char *arg, struct argp_state *state)
  switch (key)
    {
    case OPT_DEBUG_LEVEL:
-      mu_argp_node_list_new (&lst, "level", arg);
+      mu_global_debug_from_string (arg, "command line");
+      //mu_argp_node_list_new (&lst, "level", arg);
      break;
    case OPT_LINE_INFO:
--- a/libcfg/common.c
View file @5d286f5
+++ b/libcfg/common.c
View file @5d286f5
 /* This file is part of GNU Mailutils
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -21,13 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mailutils/libcfg.h"
-#include <mailutils/daemon.h>
 #include <mailutils/debug.h>
 #include <mailutils/syslog.h>
 #include <mailutils/mailbox.h>
 #include <mu_umaxtostr.h>
-static struct mu_gocs_daemon daemon_settings;
 static struct mu_gocs_locking locking_settings;
 static struct mu_gocs_logging logging_settings;
 static struct mu_gocs_mailbox mailbox_settings;
@@ -153,68 +151,6 @@ DCL_CFG_CAPA (logging);
 /* ************************************************************************* */
-/* Daemon                                                                    */
-/* ************************************************************************* */
-static int
-_cb_daemon_mode (mu_debug_t debug, void *data, char *arg)
-{
-  if (strcmp (arg, "inetd") == 0
-      || strcmp (arg, "interactive") == 0)
-    daemon_settings.mode = MODE_INTERACTIVE;
-  else if (strcmp (arg, "daemon") == 0)
-    daemon_settings.mode = MODE_DAEMON;
-  else
-    {
-      mu_cfg_format_error (debug, MU_DEBUG_ERROR, _("unknown daemon mode"));
-      return 1;
-    }
-  return 0;
-}
-static struct mu_cfg_param mu_daemon_param[] = {
-  { "max-children", mu_cfg_ulong, &daemon_settings.maxchildren, 0, NULL,
-    N_("Maximum number of children processes to run simultaneously.") },
-  { "mode", mu_cfg_callback, NULL, 0, _cb_daemon_mode,
-    N_("Set daemon mode (either inetd (or interactive) or daemon)."),
-    N_("mode") },
-  { "transcript", mu_cfg_bool, &daemon_settings.transcript, 0, NULL,
-    N_("Log the session transcript.") },
-  { "pidfile", mu_cfg_string, &daemon_settings.pidfile, 0, NULL,
-    N_("Store PID of the master process in this file."),
-    N_("file") },
-  { "port", mu_cfg_ushort, &daemon_settings.port, 0, NULL,
-    N_("Listen on the specified port number.") },
-  { "timeout", mu_cfg_ulong, &daemon_settings.timeout, 0, NULL,
-    N_("Set idle timeout.") },
-  { NULL }
-};
-int									      
-mu_daemon_section_parser
-   (enum mu_cfg_section_stage stage, const mu_cfg_node_t *node,	      
-    const char *section_label, void **section_data,
-    void *call_data, mu_cfg_tree_t *tree)
-{									      
-  switch (stage)							      
-    {									      
-    case mu_cfg_section_start:
-      daemon_settings = mu_gocs_daemon;
-      break;								      
-    case mu_cfg_section_end:
-      mu_gocs_daemon = daemon_settings;
-      mu_gocs_store ("daemon", &daemon_settings);	      
-    }									      
-  return 0;								      
-}
-struct mu_cfg_capa mu_daemon_cfg_capa = {                
-  "daemon",  mu_daemon_param, mu_daemon_section_parser
-};
-/* ************************************************************************* */
 /* Debug                                                                     */
 /* ************************************************************************* */
--- a/libcfg/init.c
View file @5d286f5
+++ b/libcfg/init.c
View file @5d286f5
 /* This file is part of GNU Mailutils
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -37,7 +37,6 @@ struct mu_cfg_capa *cfg_capa_table[] = {
  S (tls),
  S (virtdomain),
  S (sieve),
-  S (daemon),
  S (ldap),
  S (debug),
  NULL
--- a/libproto/mbox/mbox.c
View file @5d286f5
+++ b/libproto/mbox/mbox.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2003, 
-   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -1236,6 +1236,8 @@ mbox_quick_get_message (mu_mailbox_t mailbox, mu_message_qid_t qid,
      status = mbox_scan1 (mailbox, offset, 0);
      if (status != 0)
 	return status;
+      if (mud->messages_count == 0)
+	return MU_ERR_NOENT;
    }
  /* Quick access mode retrieves only one message */
--- a/maidag/lmtp.c
View file @5d286f5
+++ b/maidag/lmtp.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -564,7 +564,8 @@ typedef union
 } all_addr_t;
 int
-lmtp_connection (int fd, void *data, time_t timeout, int transcript)
+lmtp_connection (int fd, struct sockaddr *sa, int salen, void *data,
+		 mu_ip_server_t srv, time_t timeout, int transcript)
 {
  lmtp_transcript = transcript;
  lmtp_loop (fdopen (fd, "r"), fdopen (fd, "w"), timeout);
--- a/maidag/maidag.h
View file @5d286f5
+++ b/maidag/maidag.h
View file @5d286f5
@@ -133,7 +133,8 @@ int switch_user_id (struct mu_auth_data *auth, int user);
 int maidag_stdio_delivery (int argc, char **argv);
 int maidag_lmtp_server (void);
-int lmtp_connection (int fd, void *data, time_t timeout, int transcript);
+int lmtp_connection (int fd, struct sockaddr *sa, int salen, void *data,
+		     mu_ip_server_t srv, time_t timeout, int transcript);
 void mailer_err (char *fmt, ...);
 void notify_biff (mu_mailbox_t mbox, char *name, size_t size);
--- a/mailbox/Makefile.am
View file @5d286f5
+++ b/mailbox/Makefile.am
View file @5d286f5
 ## Process this file with GNU Automake to create Makefile.in
-##   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007 
+##   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 
 ##   Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
@@ -67,6 +67,7 @@ libmailutils_la_SOURCES = \
 gocs.c\
 header.c\
 iterator.c\
+ ipsrv.c\
 kwd.c\
 list.c\
 locale.c\
@@ -106,7 +107,6 @@ libmailutils_la_SOURCES = \
 system.c\
 ticket.c\
 tcp.c\
- tcpsrv.c\
 url.c\
 vartab.c\
 version.c\
--- a/mailbox/amd.c
View file @5d286f5
+++ b/mailbox/amd.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2002, 2003, 
-   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -347,6 +347,9 @@ amd_open (mu_mailbox_t mailbox, int flags)
  if (!S_ISDIR (st.st_mode))
    return EINVAL;
+  if (mailbox->locker == NULL)
+    mu_locker_create (&mailbox->locker, "/dev/null", 0);
  return 0;
 }
@@ -582,7 +585,8 @@ _amd_delim (char *str)
 }
 static int
-_amd_message_save (struct _amd_data *amd, struct _amd_message *mhm, int expunge)
+_amd_message_save (struct _amd_data *amd, struct _amd_message *mhm,
+		   int expunge)
 {
  mu_stream_t stream = NULL;
  char *name = NULL, *buf = NULL, *msg_name;
@@ -708,6 +712,7 @@ _amd_message_save (struct _amd_data *amd, struct _amd_message *mhm, int expunge)
  free (buf);
  fclose (fp);
+  /* FIXME: This does not work for maildir. */
  msg_name = amd->msg_file_name (mhm, mhm->deleted);
  if (rename (name, msg_name))
    status = errno;	  
--- a/mailbox/daemon.c
View file @5d286f5
+++ b/mailbox/daemon.c
View file @5d286f5
@@ -78,18 +78,5 @@ mu_daemon_remove_pidfile (void)
    }
 }
-struct mu_gocs_daemon mu_gocs_daemon;
-int
-mu_gocs_daemon_init (void *data)
-{
-  if (data)
-    {
-      struct mu_gocs_daemon *cfg = data;
-      mu_gocs_daemon = *cfg;
-    }
-  return 0;
-}
--- a/mailbox/gocs.c
View file @5d286f5
+++ b/mailbox/gocs.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -297,7 +297,6 @@ static struct mu_gocs_entry std_gocs_table[] = {
  { "license", mu_gocs_dummy },
  { "mailbox", mu_gocs_mailbox_init },
  { "locking", mu_gocs_locking_init },
-  { "daemon", mu_gocs_daemon_init },
  { "address", mu_gocs_source_email_init },
  { "mailer", mu_gocs_mailer_init },
  { "logging", mu_gocs_logging_init },
--- a/mailbox/tcpsrv.c → mailbox/ipsrv.c
View file @5d286f5
+++ b/mailbox/tcpsrv.c → mailbox/ipsrv.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -36,29 +36,52 @@
 #include <mailutils/nls.h>
-struct _mu_tcp_server
+struct _mu_ip_server
 {
  char *ident;
  struct sockaddr *addr;
  int addrlen;
-  int backlog;
+  int fd;
-  int fd; 
+  int type;
  mu_debug_t debug;
  mu_acl_t acl;
-  mu_tcp_server_conn_fp f_conn;
+  mu_ip_server_conn_fp f_conn;
-  mu_tcp_server_intr_fp f_intr;
+  mu_ip_server_intr_fp f_intr;
-  mu_tcp_server_free_fp f_free;
+  mu_ip_server_free_fp f_free;
  void *data;
+  union
+  {
+    struct
+    {
+      int backlog;
+    } tcp_data;
+    struct
+    {
+      char *buf;
+      size_t bufsize;
+      ssize_t rdsize;
+    } udp_data;
+  } v;
 };
 #define IDENTSTR(s) ((s)->ident ? (s)->ident : "default")
 int
-mu_tcp_server_create (mu_tcp_server_t *psrv, struct sockaddr *addr,
+mu_ip_server_create (mu_ip_server_t *psrv, struct sockaddr *addr,
-		      int addrlen)
+		     int addrlen, int type)
 {
-  struct _mu_tcp_server *srv;
+  struct _mu_ip_server *srv;
  mu_log_level_t level;
+  switch (type)
+    {
+    case MU_IP_UDP:
+    case MU_IP_TCP:
+      break;
+    default:
+      return EINVAL;
+    }
  srv = calloc (1, sizeof *srv);
  if (!srv)
@@ -71,22 +94,32 @@ mu_tcp_server_create (mu_tcp_server_t *psrv, struct sockaddr *addr,
    }
  memcpy (srv->addr, addr, addrlen);
  srv->addrlen = addrlen;
-  level = mu_global_debug_level ("tcp_server");
+  srv->type = type;
+  level = mu_global_debug_level ("ip_server");
  if (level)
    {
      mu_debug_create (&srv->debug, NULL);
      mu_debug_set_level (srv->debug, level);
    }
  srv->fd = -1;
-  srv->backlog = 4;
+  switch (type)
+    {
+    case MU_IP_UDP:
+      srv->v.udp_data.bufsize = 4096;
+      break;
+    case MU_IP_TCP:
+      srv->v.tcp_data.backlog = 4;
+    }
  *psrv = srv;
  return 0;
 }
 int
-mu_tcp_server_destroy (mu_tcp_server_t *psrv)
+mu_ip_server_destroy (mu_ip_server_t *psrv)
 {
-  mu_tcp_server_t srv;
+  mu_ip_server_t srv;
  if (!psrv)
    return EINVAL;
  srv = *psrv;
@@ -97,13 +130,15 @@ mu_tcp_server_destroy (mu_tcp_server_t *psrv)
  close (srv->fd);
  free (srv->addr);
  free (srv->ident);
+  if (srv->type == MU_IP_UDP && srv->v.udp_data.buf)
+    free (srv->v.udp_data.buf);
  free (srv);
  *psrv = NULL;
  return 0;
 }
 int
-mu_tcp_server_set_debug (mu_tcp_server_t srv, mu_debug_t debug)
+mu_ip_server_set_debug (mu_ip_server_t srv, mu_debug_t debug)
 {
  if (!srv)
    return EINVAL;
@@ -113,7 +148,7 @@ mu_tcp_server_set_debug (mu_tcp_server_t srv, mu_debug_t debug)
 }
 int
-mu_tcp_server_get_debug (mu_tcp_server_t srv, mu_debug_t *pdebug)
+mu_ip_server_get_debug (mu_ip_server_t srv, mu_debug_t *pdebug)
 {
  if (!srv)
    return EINVAL;
@@ -122,16 +157,50 @@ mu_tcp_server_get_debug (mu_tcp_server_t srv, mu_debug_t *pdebug)
 }
 int
-mu_tcp_server_set_backlog (mu_tcp_server_t srv, int backlog)
+mu_ip_server_get_type (mu_ip_server_t srv, int *ptype)
 {
  if (!srv)
    return EINVAL;
-  srv->backlog = backlog;
+  *ptype = srv->type;
  return 0;
 }
 int
-mu_tcp_server_set_ident (mu_tcp_server_t srv, const char *ident)
+mu_tcp_server_set_backlog (mu_ip_server_t srv, int backlog)
+{
+  if (!srv || srv->type != MU_IP_TCP)
+    return EINVAL;
+  srv->v.tcp_data.backlog = backlog;
+  return 0;
+}
+int
+mu_udp_server_get_bufsize (mu_ip_server_t srv, size_t *psize)
+{
+  if (!srv || srv->type != MU_IP_UDP)
+    return EINVAL;
+  *psize = srv->v.udp_data.bufsize;
+  return 0;
+}
+int
+mu_udp_server_set_bufsize (mu_ip_server_t srv, size_t size)
+{
+  if (!srv || srv->type != MU_IP_UDP)
+    return EINVAL;
+  srv->v.udp_data.bufsize = size;
+  if (srv->v.udp_data.buf)
+    {
+      char *p = realloc (srv->v.udp_data.buf, size);
+      if (!p)
+	return ENOMEM;
+      srv->v.udp_data.buf = p;
+    }
+  return 0;
+}  
+int
+mu_ip_server_set_ident (mu_ip_server_t srv, const char *ident)
 {
  if (!srv)
    return EINVAL;
@@ -144,7 +213,7 @@ mu_tcp_server_set_ident (mu_tcp_server_t srv, const char *ident)
 }
 int
-mu_tcp_server_set_acl (mu_tcp_server_t srv, mu_acl_t acl)
+mu_ip_server_set_acl (mu_ip_server_t srv, mu_acl_t acl)
 {
  if (!srv)
    return EINVAL;
@@ -153,7 +222,7 @@ mu_tcp_server_set_acl (mu_tcp_server_t srv, mu_acl_t acl)
 }
 int
-mu_tcp_server_set_conn (mu_tcp_server_t srv, mu_tcp_server_conn_fp conn)
+mu_ip_server_set_conn (mu_ip_server_t srv, mu_ip_server_conn_fp conn)
 {
  if (!srv)
    return EINVAL;
@@ -162,7 +231,7 @@ mu_tcp_server_set_conn (mu_tcp_server_t srv, mu_tcp_server_conn_fp conn)
 }
 int
-mu_tcp_server_set_intr (mu_tcp_server_t srv, mu_tcp_server_intr_fp intr)
+mu_ip_server_set_intr (mu_ip_server_t srv, mu_ip_server_intr_fp intr)
 {
  if (!srv)
    return EINVAL;
@@ -171,8 +240,8 @@ mu_tcp_server_set_intr (mu_tcp_server_t srv, mu_tcp_server_intr_fp intr)
 }
 int
-mu_tcp_server_set_data (mu_tcp_server_t srv,
+mu_ip_server_set_data (mu_ip_server_t srv,
-			void *data, mu_tcp_server_free_fp free)
+			void *data, mu_ip_server_free_fp free)
 {
  if (!srv)
    return EINVAL;
@@ -181,8 +250,8 @@ mu_tcp_server_set_data (mu_tcp_server_t srv,
  return 0;
 }
-static int
+int
-family_to_proto (int family)
+mu_address_family_to_domain (int family)
 {
  switch (family)
    {
@@ -198,7 +267,7 @@ family_to_proto (int family)
 }
 int
-mu_tcp_server_open (mu_tcp_server_t srv)
+mu_ip_server_open (mu_ip_server_t srv)
 {
  int fd;
@@ -214,7 +283,8 @@ mu_tcp_server_open (mu_tcp_server_t srv)
      free (p);
    }
-  fd = socket (family_to_proto (srv->addr->sa_family), SOCK_STREAM, 0);
+  fd = socket (mu_address_family_to_domain (srv->addr->sa_family),
+	       ((srv->type == MU_IP_UDP) ? SOCK_DGRAM : SOCK_STREAM), 0);
  if (fd == -1)
    {
      MU_DEBUG2 (srv->debug, MU_DEBUG_ERROR,
@@ -275,12 +345,15 @@ mu_tcp_server_open (mu_tcp_server_t srv)
      return errno;
    }
-  if (listen (fd, srv->backlog) == -1) 
+  if (srv->type == MU_IP_TCP)
    {
-      MU_DEBUG2 (srv->debug, MU_DEBUG_ERROR,
+      if (listen (fd, srv->v.tcp_data.backlog) == -1) 
-		 "%s: listen: %s\n", IDENTSTR (srv), mu_strerror (errno));
+	{
-      close (fd);
+	  MU_DEBUG2 (srv->debug, MU_DEBUG_ERROR,
-      return errno;
+		     "%s: listen: %s\n", IDENTSTR (srv), mu_strerror (errno));
+	  close (fd);
+	  return errno;
+	}
    }
  srv->fd = fd;
@@ -288,7 +361,7 @@ mu_tcp_server_open (mu_tcp_server_t srv)
 }
 int
-mu_tcp_server_shutdown (mu_tcp_server_t srv)
+mu_ip_server_shutdown (mu_ip_server_t srv)
 {
  if (!srv || srv->fd != -1)
    return EINVAL;
@@ -305,19 +378,20 @@ mu_tcp_server_shutdown (mu_tcp_server_t srv)
 }
 int
-mu_tcp_server_accept (mu_tcp_server_t srv, void *call_data)
+mu_ip_tcp_accept (mu_ip_server_t srv, void *call_data)
 {
  int rc;
  int connfd;
  union
  {
    struct sockaddr sa;
-    char buffer[512];
+    struct sockaddr_in s_in;
+    struct sockaddr_un s_un;
  } client;
  socklen_t size = sizeof (client);
-  if (!srv || srv->fd == -1)
+  if (!srv || srv->fd == -1 || srv->type == MU_IP_UDP)
    return EINVAL;
  connfd = accept (srv->fd, &client.sa, &size);
@@ -327,7 +401,7 @@ mu_tcp_server_accept (mu_tcp_server_t srv, void *call_data)
      if (ec == EINTR)
 	{
 	  if (srv->f_intr && srv->f_intr (srv->data, call_data))
-	    mu_tcp_server_shutdown (srv);
+	    mu_ip_server_shutdown (srv);
 	}
      return ec;
    }
@@ -351,23 +425,117 @@ mu_tcp_server_accept (mu_tcp_server_t srv, void *call_data)
 	}
    }
  rc = srv->f_conn (connfd, &client.sa, size, srv->data, call_data, srv);
-  if (rc)
-    mu_tcp_server_shutdown (srv);
  close (connfd);
  return rc;
 }
 int
-mu_tcp_server_loop (mu_tcp_server_t srv, void *call_data)
+mu_ip_udp_accept (mu_ip_server_t srv, void *call_data)
+{
+  int rc;
+  union
+  {
+    struct sockaddr sa;
+    struct sockaddr_in s_in;
+    struct sockaddr_un s_un;
+  } client;
+  fd_set rdset;
+  socklen_t salen = sizeof (client);
+  ssize_t size;
+  if (!srv->v.udp_data.buf)
+    {
+      srv->v.udp_data.buf = malloc (srv->v.udp_data.bufsize);
+      if (!srv->v.udp_data.buf)
+	return ENOMEM;
+    }
+  FD_ZERO (&rdset);
+  FD_SET (srv->fd, &rdset);
+  for (;;)
+    {
+      rc = select (srv->fd + 1, &rdset, NULL, NULL, NULL);
+      if (rc == -1)
+	{
+	  if (errno == EINTR)
+	    {
+	      if (srv->f_intr && srv->f_intr (srv->data, call_data))
+		break;
+	      else
+		continue;
+	    }
+	}
+      else
+	break;
+    }
+  if (rc == -1)
+    return errno;
+  size = recvfrom (srv->fd, srv->v.udp_data.buf, srv->v.udp_data.bufsize,
+		   0, &client.sa, &salen);
+  if (size < 0)
+    {
+      MU_DEBUG2 (srv->debug, MU_DEBUG_ERROR,
+		 "%s: recvfrom: %s",
+		 IDENTSTR (srv), strerror (errno));
+      return MU_ERR_FAILURE;
+    }
+  srv->v.udp_data.rdsize = size;
+  if (srv->acl)
+    {
+      mu_acl_result_t res;
+      int rc = mu_acl_check_sockaddr (srv->acl, &client.sa, size, &res);
+      if (rc)
+	MU_DEBUG2 (srv->debug, MU_DEBUG_ERROR,
+		   "%s: mu_acl_check_sockaddr: %s\n",
+		   IDENTSTR (srv), strerror (rc));
+      if (res == mu_acl_result_deny)
+	{
+	  char *p = mu_sockaddr_to_astr (srv->addr, srv->addrlen);
+	  mu_diag_output (MU_DIAG_INFO, "Denying connection from %s", p);
+	  free (p);
+	  return 0;
+	}
+    }
+  rc = srv->f_conn (-1, &client.sa, size, srv->data, call_data, srv);
+  return rc;
+}
+int
+mu_ip_server_accept (mu_ip_server_t srv, void *call_data)
+{
+  int rc;
+  if (!srv || srv->fd == -1)
+    return EINVAL;
+  switch (srv->type)
+    {
+    case MU_IP_UDP:
+      rc = mu_ip_udp_accept (srv, call_data);
+      break;
+    case MU_IP_TCP:
+      rc = mu_ip_tcp_accept (srv, call_data);
+    }
+  if (rc)
+    mu_ip_server_shutdown (srv);
+  return rc;
+}
+int
+mu_ip_server_loop (mu_ip_server_t srv, void *call_data)
 {
  if (!srv)
    return EINVAL;
  while (srv->fd != -1)
    {
-      int rc = mu_tcp_server_accept (srv, call_data);
+      int rc = mu_ip_server_accept (srv, call_data);
      if (rc && rc != EINTR)
 	{
-	  mu_tcp_server_shutdown (srv);
+	  mu_ip_server_shutdown (srv);
 	  return rc;
 	}
    }
@@ -375,13 +543,23 @@ mu_tcp_server_loop (mu_tcp_server_t srv, void *call_data)
 }
 int
-mu_tcp_server_get_fd (mu_tcp_server_t srv)
+mu_ip_server_get_fd (mu_ip_server_t srv)
 {
  return srv->fd;
 }
 int
-mu_tcp_server_get_sockaddr (mu_tcp_server_t srv, struct sockaddr *s, int *size)
+mu_udp_server_get_rdata (mu_ip_server_t srv, char **pbuf, size_t *pbufsize)
+{
+  if (!srv || srv->type != MU_IP_UDP)
+    return EINVAL;
+  *pbuf = srv->v.udp_data.buf;
+  *pbufsize = srv->v.udp_data.rdsize;
+  return 0;
+}
+int
+mu_ip_server_get_sockaddr (mu_ip_server_t srv, struct sockaddr *s, int *size)
 {
  int len;
--- a/mailbox/locker.c
View file @5d286f5
+++ b/mailbox/locker.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2005, 2006, 
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -103,11 +103,15 @@ static int unlock_kernel (mu_locker_t);
 static int prelock_common (mu_locker_t);
 static struct locker_tab locker_tab[] = {
+  /* MU_LOCKER_TYPE_DOTLOCK */
  { init_dotlock, destroy_dotlock, prelock_common,
    lock_dotlock, unlock_dotlock },
+  /* MU_LOCKER_TYPE_EXTERNAL */
  { init_external, destroy_external, prelock_common,
    lock_external, unlock_external },
+  /* MU_LOCKER_TYPE_KERNEL */
  { init_kernel, NULL, NULL, lock_kernel, unlock_kernel },
+  /* MU_LOCKER_TYPE_NULL */
  { NULL, NULL, NULL, NULL, NULL }
 };
@@ -246,17 +250,37 @@ mu_locker_set_default_external_program (char *path)
 }
 int
-mu_locker_set_flags (mu_locker_t locker, int flags)
+mu_locker_mod_flags (mu_locker_t locker, int flags,
+		     enum mu_locker_set_mode mode)
 {
  unsigned otype, ntype;
+  int new_flags;
  if (!locker)
    return MU_ERR_LOCKER_NULL;
+  switch (mode)
+    {
+    case mu_locker_assign:
+      new_flags = flags;
+      break;
+    case mu_locker_set_bit:
+      new_flags = locker->flags | flags;
+      break;
+    case mu_locker_clear_bit:
+      new_flags = locker->flags & ~flags;
+      break;
+    default:
+      return EINVAL;
+    }
  otype = MU_LOCKER_TYPE (locker);
  if (otype >= MU_LOCKER_NTYPES)
    return EINVAL;
-  ntype = MU_LOCKER_FLAG_TO_TYPE (flags);
+  ntype = MU_LOCKER_FLAG_TO_TYPE (new_flags);
  if (ntype >= MU_LOCKER_NTYPES)
    return EINVAL;
@@ -266,22 +290,28 @@ mu_locker_set_flags (mu_locker_t locker, int flags)
      if (locker_tab[otype].destroy)
 	locker_tab[otype].destroy (locker);
-      locker->flags = flags;
+      locker->flags = new_flags;
-      if (locker_tab[otype].init)
+      if (locker_tab[ntype].init)
 	{
-	  rc = locker_tab[otype].init (locker);
+	  rc = locker_tab[ntype].init (locker);
 	  if (rc)
 	    locker->flags = MU_LOCKER_NULL;
 	  return rc;
 	}
    }
  else
-    locker->flags = flags;
+    locker->flags = new_flags;
  return 0;
 }
 int
+mu_locker_set_flags (mu_locker_t locker, int flags)
+{
+  return mu_locker_mod_flags (locker, flags, mu_locker_assign);
+}
+int
 mu_locker_set_expire_time (mu_locker_t locker, int etime)
 {
  if (!locker)
--- a/mailbox/msrv.c
View file @5d286f5
+++ b/mailbox/msrv.c
View file @5d286f5
@@ -15,6 +15,10 @@
   Public License along with this library; If not, see
   <http://www.gnu.org/licenses/>.  */
+/* This is an `m-server' - a universal framework for multi-process TCP
+   servers. An `m-' stands for `mail-', or `multi-' or maybe `meta-',
+   I don't remember what. */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -62,28 +66,52 @@ set_signal (int sig, mu_sig_handler_t handler)
 struct _mu_m_server
 {
-  char *ident;
+  char *ident;                   /* Server identifier, for logging purposes.*/
-  mu_server_t server;
+  int deftype;                   /* Default server type: MU_IP_TCP/MU_IP_UDP */
-  mu_list_t srvlist;
+  mu_server_t server;            /* The server object. */
-  mu_m_server_conn_fp conn;
+  mu_list_t srvlist;             /* A list of configured mu_ip_server_t
-  mu_m_server_prefork_fp prefork;
+				    objects. It is cleared after the objects
-  void *data;
+				    are opened and attached to the server. */
-  int mode;
-  int foreground;
+  mu_m_server_conn_fp conn;      /* Connection handler function. */
-  size_t max_children;
+  mu_m_server_prefork_fp prefork;/* Pre-fork function. */
-  char *pidfile;
+  void *data;                    /* User-supplied data for conn and prefork. */
-  unsigned short defport;
-  time_t timeout;
+  int mode;                      /* Server mode: should be removed. */
-  mu_acl_t acl;
+  int foreground;                /* Should the server remain in foregorund? */
-  sigset_t sigmask;
+  size_t max_children;           /* Maximum number of sub-processes to run. */
-  mu_sig_handler_t sigtab[NSIG]; 
+  char *pidfile;                 /* Name of a PID-file. */ 
+  unsigned short defport;        /* Default port number. */
+  time_t timeout;                /* Default idle timeout. */
+  mu_acl_t acl;                  /* Global access control list. */
+  sigset_t sigmask;              /* A set of signals to handle by the
+				    m-server.  */
+  mu_sig_handler_t sigtab[NSIG]; /* Keeps old signal handlers. */
+};
+struct m_srv_config        /* Configuration data for a single TCP server. */
+{
+  mu_m_server_t msrv;      /* Parent m-server. */  
+  mu_ip_server_t tcpsrv;  /* TCP server these data are for. */
+  mu_acl_t acl;            /* Access control list for this server. */ 
+  int single_process;      /* Should it run as a single process? */
+  int transcript;          /* Enable session transcript. */
+  time_t timeout;          /* Idle timeout for this server. */
 };
 static int need_cleanup = 0;
 static int stop = 0;
 static size_t children;
+void
+mu_m_server_stop (int code)
+{
+  stop = code;
+}
 static int
 mu_m_server_idle (void *server_data MU_ARG_UNUSED)
 {
@@ -156,6 +184,7 @@ mu_m_server_create (mu_m_server_t *psrv, const char *ident)
 	  exit (1);
 	}
    }
+  srv->deftype = MU_IP_TCP;
  MU_ASSERT (mu_server_create (&srv->server));
  mu_server_set_idle (srv->server, mu_m_server_idle);
  sigemptyset (&srv->sigmask);
@@ -168,6 +197,18 @@ mu_m_server_create (mu_m_server_t *psrv, const char *ident)
 }
 void
+mu_m_server_set_type (mu_m_server_t srv, int type)
+{
+  srv->deftype = type;
+}
+void
+mu_m_server_get_type (mu_m_server_t srv, int *type)
+{
+  *type = srv->deftype;
+}
+void
 mu_m_server_set_sigset (mu_m_server_t srv, sigset_t *sigset)
 {
  srv->sigmask = *sigset;
@@ -242,16 +283,6 @@ mu_m_server_timeout (mu_m_server_t srv)
  return srv->timeout;
 }
-struct m_srv_config
-{
-  mu_m_server_t msrv;
-  mu_tcp_server_t tcpsrv;
-  mu_acl_t acl;
-  int single_process;
-  int transcript;
-  time_t timeout;
-};
 void
 m_srv_config_free (void *data)
 {
@@ -262,16 +293,16 @@ m_srv_config_free (void *data)
 static int m_srv_conn (int fd, struct sockaddr *sa, int salen,
 		       void *server_data, void *call_data,
-		       mu_tcp_server_t srv);
+		       mu_ip_server_t srv);
 static struct m_srv_config *
-add_server (mu_m_server_t msrv, struct sockaddr *s, int slen)
+add_server (mu_m_server_t msrv, struct sockaddr *s, int slen, int type)
 {
-  mu_tcp_server_t tcpsrv;
+  mu_ip_server_t tcpsrv;
  struct m_srv_config *pconf;
-  MU_ASSERT (mu_tcp_server_create (&tcpsrv, s, slen));
+  MU_ASSERT (mu_ip_server_create (&tcpsrv, s, slen, type)); /* FIXME: type */
-  MU_ASSERT (mu_tcp_server_set_conn (tcpsrv, m_srv_conn));
+  MU_ASSERT (mu_ip_server_set_conn (tcpsrv, m_srv_conn));
  pconf = calloc (1, sizeof (*pconf));
  if (!pconf)
    {
@@ -282,7 +313,7 @@ add_server (mu_m_server_t msrv, struct sockaddr *s, int slen)
  pconf->tcpsrv = tcpsrv;
  pconf->single_process = 0;
  pconf->timeout = msrv->timeout;
-  MU_ASSERT (mu_tcp_server_set_data (tcpsrv, pconf, m_srv_config_free));
+  MU_ASSERT (mu_ip_server_set_data (tcpsrv, pconf, m_srv_config_free));
  if (!msrv->srvlist)
    MU_ASSERT (mu_list_create (&msrv->srvlist));
  MU_ASSERT (mu_list_append (msrv->srvlist, tcpsrv));
@@ -306,9 +337,10 @@ mu_m_server_begin (mu_m_server_t msrv)
    {
      /* Add default server */
      struct sockaddr_in s;
+      s.sin_family = AF_INET;
      s.sin_addr.s_addr = htonl (INADDR_ANY);
      s.sin_port = htons (msrv->defport);
-      add_server (msrv, (struct sockaddr *)&s, sizeof s);	  
+      add_server (msrv, (struct sockaddr *)&s, sizeof s, msrv->deftype);
    }
  if (!msrv->foreground)
@@ -363,11 +395,11 @@ mu_m_server_destroy (mu_m_server_t *pmsrv)
 static int
 tcp_conn_handler (int fd, void *conn_data, void *server_data)
 {
-  mu_tcp_server_t tcpsrv = (mu_tcp_server_t) conn_data;
+  mu_ip_server_t tcpsrv = (mu_ip_server_t) conn_data;
-  int rc = mu_tcp_server_accept (tcpsrv, server_data);
+  int rc = mu_ip_server_accept (tcpsrv, server_data);
  if (rc && rc != EINTR)
    {
-      mu_tcp_server_shutdown (tcpsrv);
+      mu_ip_server_shutdown (tcpsrv);
      return MU_SERVER_CLOSE_CONN;
    }
  return stop ? MU_SERVER_SHUTDOWN : MU_SERVER_SUCCESS;
@@ -376,8 +408,8 @@ tcp_conn_handler (int fd, void *conn_data, void *server_data)
 static void
 tcp_conn_free (void *conn_data, void *server_data)
 {
-  mu_tcp_server_t tcpsrv = (mu_tcp_server_t) conn_data;
+  mu_ip_server_t tcpsrv = (mu_ip_server_t) conn_data;
-  mu_tcp_server_destroy (&tcpsrv);
+  mu_ip_server_destroy (&tcpsrv);
 }
 static int
@@ -391,29 +423,29 @@ _open_conn (void *item, void *data)
  addr;
  int addrlen = sizeof addr;
  char *p;
-  mu_tcp_server_t tcpsrv = item;
+  mu_ip_server_t tcpsrv = item;
  mu_m_server_t msrv = data;
-  int rc = mu_tcp_server_open (tcpsrv);
+  int rc = mu_ip_server_open (tcpsrv);
  if (rc)
    {
-      mu_tcp_server_get_sockaddr (tcpsrv, &addr.sa, &addrlen);
+      mu_ip_server_get_sockaddr (tcpsrv, &addr.sa, &addrlen);
      p = mu_sockaddr_to_astr (&addr.sa, addrlen);
      mu_error (_("Cannot open connection on %s: %s"), p, mu_strerror (rc));
      free (p);
      return 0;
    }
  rc = mu_server_add_connection (msrv->server,
-				 mu_tcp_server_get_fd (tcpsrv),
+				 mu_ip_server_get_fd (tcpsrv),
 				 tcpsrv,
 				 tcp_conn_handler, tcp_conn_free);
  if (rc)
    {
-      mu_tcp_server_get_sockaddr (tcpsrv, &addr.sa, &addrlen);
+      mu_ip_server_get_sockaddr (tcpsrv, &addr.sa, &addrlen);
      p = mu_sockaddr_to_astr (&addr.sa, addrlen);
      mu_error (_("Cannot add connection %s: %s"), p, mu_strerror (rc));
      free (p);
-      mu_tcp_server_shutdown (tcpsrv);
+      mu_ip_server_shutdown (tcpsrv);
-      mu_tcp_server_destroy (&tcpsrv);
+      mu_ip_server_destroy (&tcpsrv);
    }
  return 0;
 }  
@@ -443,8 +475,8 @@ mu_m_server_run (mu_m_server_t msrv)
-static int
+int
-check_global_acl (mu_m_server_t msrv, struct sockaddr *s, int salen)
+mu_m_server_check_acl (mu_m_server_t msrv, struct sockaddr *s, int salen)
 {
  if (msrv->acl)
    {
@@ -488,14 +520,14 @@ check_global_acl (mu_m_server_t msrv, struct sockaddr *s, int salen)
 int
 m_srv_conn (int fd, struct sockaddr *sa, int salen,
 	    void *server_data, void *call_data,
-	    mu_tcp_server_t srv)
+	    mu_ip_server_t srv)
 {
  int status;
  struct m_srv_config *pconf = server_data;
-  if (check_global_acl (pconf->msrv, sa, salen))
-    return 0;
+  if (mu_m_server_check_acl (pconf->msrv, sa, salen))
+    return 0;
  if (!pconf->single_process)
    {
      pid_t pid;
@@ -509,7 +541,8 @@ m_srv_conn (int fd, struct sockaddr *sa, int salen,
          pause ();
          return 0;
        }
-      if (pconf->msrv->prefork && pconf->msrv->prefork (fd, sa, salen))
+      if (pconf->msrv->prefork
+	  && pconf->msrv->prefork (fd, pconf->msrv->data, sa, salen))
 	return 0;
      pid = fork ();
@@ -517,8 +550,8 @@ m_srv_conn (int fd, struct sockaddr *sa, int salen,
 	mu_diag_output (MU_DIAG_ERROR, "fork: %s", strerror (errno));
      else if (pid == 0) /* Child.  */
 	{
-	  mu_tcp_server_shutdown (srv);
+	  mu_ip_server_shutdown (srv); /* FIXME: does it harm for MU_IP_UDP? */
-	  status = pconf->msrv->conn (fd, pconf->msrv->data,
+	  status = pconf->msrv->conn (fd, sa, salen, pconf->msrv->data, srv,
 				      pconf->timeout, pconf->transcript);
 	  closelog ();
 	  exit (status);
@@ -528,10 +561,10 @@ m_srv_conn (int fd, struct sockaddr *sa, int salen,
 	  children++;
 	}
    }
-  else
+  else if (pconf->msrv->prefork
-    pconf->msrv->conn (fd, pconf->msrv->data,
+	   && pconf->msrv->prefork (fd, pconf->msrv->data, sa, salen) == 0)
+    pconf->msrv->conn (fd, sa, salen, pconf->msrv->data, srv,
 		       pconf->timeout, pconf->transcript);
  return 0;
 }
@@ -718,7 +751,7 @@ server_block_begin (mu_debug_t debug, char *arg, mu_m_server_t msrv,
 	}
    }
-  *pdata = add_server (msrv, &s.s_sa, salen);
+  *pdata = add_server (msrv, &s.s_sa, salen, msrv->deftype);
  return 0;
 }
@@ -743,7 +776,7 @@ server_section_parser (enum mu_cfg_section_stage stage,
      {
 	struct m_srv_config *pconf = *section_data;
 	if (pconf->acl)
-	  mu_tcp_server_set_acl (pconf->tcpsrv, pconf->acl);
+	  mu_ip_server_set_acl (pconf->tcpsrv, pconf->acl);
      }
      break;
    }
--- a/mailbox/server.c
View file @5d286f5
+++ b/mailbox/server.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -201,8 +201,12 @@ mu_server_destroy (mu_server_t *psrv)
  if (!srv)
    return 0;
-  for (p = srv->head; p; p = p->next)
+  for (p = srv->head; p; )
-    destroy_connection (srv, p);
+    {
+      struct _mu_connection *next = p->next;
+      destroy_connection (srv, p);
+      p = next;
+    }
  if (srv->f_free)
    srv->f_free (srv->server_data);
--- a/po/POTFILES.in
View file @5d286f5
+++ b/po/POTFILES.in
View file @5d286f5
 #
 # List of source files containing translatable strings.
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
 #
 auth/pam.c
@@ -8,7 +8,7 @@ auth/sql.c
 auth/tls.c
 auth/virtual.c
 comsat/action.c
-comsat/cfg.c
+comsat/oldcfg.c
 comsat/comsat.c
 config/mailutils-config.c
 dotlock/dotlock.c
@@ -107,6 +107,7 @@ mailbox/cfg_lexer.c
 mailbox/errors
 mailbox/file_stream.c
 mailbox/filter_iconv.c
+mailbox/ipsrv.c
 mailbox/message.c
 mailbox/mu_auth.c
 mailbox/mutil.c
--- a/pop3d/lock.c
View file @5d286f5
+++ b/pop3d/lock.c
View file @5d286f5
 /* GNU Mailutils -- a suite of utilities for electronic mail
   Copyright (C) 1999, 2000, 2001, 2002, 2005,
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
   GNU Mailutils is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ pop3d_lock ()
  mu_mailbox_get_url (mbox, &url);
  name = mu_url_to_string (url);
  mu_mailbox_get_locker (mbox, &lock);
-  mu_locker_set_flags (lock, MU_LOCKER_PID);
+  mu_locker_mod_flags (lock, MU_LOCKER_PID, mu_locker_set_bit);
  if ((status = mu_locker_lock (lock)))
    {
      mu_diag_output (MU_DIAG_NOTICE, _("Locking mailbox `%s' failed: %s"),
--- a/pop3d/pop3d.c
View file @5d286f5
+++ b/pop3d/pop3d.c
View file @5d286f5
@@ -447,7 +447,8 @@ pop3d_mainloop (int fd, FILE *infile, FILE *outfile)
 }
 int
-pop3d_connection (int fd, void *data, time_t timeout, int transcript)
+pop3d_connection (int fd, struct sockaddr *sa, int salen, void *data,
+		  mu_ip_server_t srv, time_t timeout, int transcript)
 {
  idle_timeout = timeout;
  pop3d_transcript = transcript;