Added TLS/SSL support (via GnuTLS)

Wojciech Polak
Commit 6b97e35b ... 6b97e35bebf12ea2a4e2d47a2c056ef53e46bd3d authored 2003-01-17 19:07:15 +0000 by Wojciech Polak
Showing 10 changed files with 224 additions and 151 deletions
imap4d/Makefile.am
imap4d/auth_gss.c
imap4d/bye.c
imap4d/capability.c
imap4d/commands.c
imap4d/imap4d.c
imap4d/imap4d.h
imap4d/signal.c
imap4d/starttls.c
imap4d/util.c
--- a/imap4d/Makefile.am
View file @6b97e35
+++ b/imap4d/Makefile.am
View file @6b97e35
 ## Process this file with GNU Automake to create Makefile.in
-##   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+##   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 ##
-##   GNU Mailtuils is free software; you can redistribute it and/or
+##   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 2, or (at
 ##   your option) any later version.
 ##
-##   This program is distributed in the hope that it will be useful, but
+##   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, write to the Free Software
+##   along with GNU Mailutils; if not, write to the Free Software
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -26,8 +26,8 @@ imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailuti
 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
 commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \
 imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \
- select.c signal.c status.c store.c subscribe.c sync.c uid.c unsubscribe.c \
+ select.c signal.c starttls.c status.c store.c subscribe.c sync.c uid.c \
- util.c version.c
+ unsubscribe.c util.c version.c
 ## This kludge is necessary to correctly establish imap4d -> AUTHOBJS
 ## dependency. Think about better approach         --gray
--- a/imap4d/auth_gss.c
View file @6b97e35
+++ b/imap4d/auth_gss.c
View file @6b97e35
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 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
@@ -13,9 +13,10 @@
   You should have received a copy of the GNU General Public License
   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
-/* GSSAPI authentication for imap (rfc 1731). 
+/*
+  GSSAPI authentication for imap (rfc 1731). 
 */
 #include "imap4d.h"
@@ -46,11 +47,8 @@ display_status_1 (char *m, OM_uint32 code, int type)
  do
    {
      maj_stat = gss_display_status (&min_stat, code,
-				     type, GSS_C_NULL_OID,
+				     type, GSS_C_NULL_OID, &msg_ctx, &msg);
-				     &msg_ctx, &msg);
+      syslog (LOG_ERR, _("GSS-API error %s: %s\n"), m, (char *) msg.value);
-      syslog (LOG_ERR,
-	      _("GSS-API error %s: %s\n"), m,
-	      (char *)msg.value);
      gss_release_buffer (&min_stat, &msg);
    }
  while (msg_ctx);
@@ -64,14 +62,14 @@ display_status (char *msg, OM_uint32 maj_stat, OM_uint32 min_stat)
 }
 static int
-imap4d_gss_userok(gss_buffer_t client_name, char *name)
+imap4d_gss_userok (gss_buffer_t client_name, char *name)
 {
  int rc = -1;
  krb5_principal p;
  krb5_context kcontext;
  krb5_init_context (&kcontext);
  if (krb5_parse_name (kcontext, client_name->value, &p) != 0)
    return -1;
  if (krb5_kuserok (kcontext, p, name))
@@ -99,57 +97,54 @@ auth_gssapi (struct imap4d_command *command, char **username)
  gss_qop_t quality;
  gss_name_t client;
  gss_buffer_desc client_name;
  /* Obtain server credentials. RFC 1732 states, that 
-      "The server must issue a ready response with no data and pass the
+     "The server must issue a ready response with no data and pass the
-       resulting client supplied token to GSS_Accept_sec_context as
+     resulting client supplied token to GSS_Accept_sec_context as
-       input_token, setting acceptor_cred_handle to NULL (for "use default
+     input_token, setting acceptor_cred_handle to NULL (for "use default
-       credentials"), and 0 for input_context_handle (initially)."
+     credentials"), and 0 for input_context_handle (initially)."
     In MIT implementation, passing NULL as acceptor_cred_handle won't
     work (possibly due to a bug in krb5_gss_accept_sec_context()), so
     we acquire server credentials explicitly. */
-  asprintf ((char**)&tmp, "imap@%s", util_localname ());
+  asprintf ((char **) &tmp, "imap@%s", util_localname ());
  tokbuf.value = tmp;
  tokbuf.length = strlen (tokbuf.value) + 1;
  maj_stat = gss_import_name (&min_stat, &tokbuf,
-			      gss_nt_service_name,
+			      gss_nt_service_name, &server_name);
-			      &server_name);
  if (maj_stat != GSS_S_COMPLETE)
    {
      display_status ("import name", maj_stat, min_stat);
-      util_finish (command, RESP_NO,
+      util_finish (command, RESP_NO, "GSSAPI authentication not available");
-		   "GSSAPI authentication not available");
      return 1;
    }
  maj_stat = gss_acquire_cred (&min_stat, server_name, 0,
 			       GSS_C_NULL_OID_SET, GSS_C_ACCEPT,
 			       &server_creds, NULL, NULL);
-  gss_release_name(&min_stat2, &server_name);
+  gss_release_name (&min_stat2, &server_name);
  if (maj_stat != GSS_S_COMPLETE)
    {
      display_status ("acquire credentials", maj_stat, min_stat);
-      util_finish (command, RESP_NO,
+      util_finish (command, RESP_NO, "GSSAPI authentication not available");
-		   "GSSAPI authentication not available");
      return 1;
    }
  /* Start the dialogue */
  util_send ("+ GO AHEAD\r\n");
  context = GSS_C_NO_CONTEXT;
  for (;;)
    {
-      token_str = imap4d_readline_ex (ifile);
+      token_str = imap4d_readline_ex ();
      util_base64_decode (token_str, strlen (token_str), &tmp, &size);
      tokbuf.value = tmp;
      tokbuf.length = size;
      free (token_str);
      maj_stat = gss_accept_sec_context (&min_stat,
 					 &context,
 					 server_creds,
@@ -158,9 +153,7 @@ auth_gssapi (struct imap4d_command *command, char **username)
 					 &client,
 					 &mech_type,
 					 &outbuf,
-					 &cflags,
+					 &cflags, NULL, &cred_handle);
-					 NULL,
-					 &cred_handle);
      free (tmp);
      if (maj_stat == GSS_S_CONTINUE_NEEDED)
 	{
@@ -176,12 +169,11 @@ auth_gssapi (struct imap4d_command *command, char **username)
      else if (maj_stat == GSS_S_COMPLETE)
 	break;
      /* Bail out otherwise */
      display_status ("accept context", maj_stat, min_stat);
      maj_stat = gss_delete_sec_context (&min_stat, &context, &outbuf);
      gss_release_buffer (&min_stat, &outbuf);
-      util_finish (command, RESP_NO,
+      util_finish (command, RESP_NO, "GSSAPI authentication failed");
-		   "GSSAPI authentication failed");
      return 1;
    }
@@ -191,7 +183,7 @@ auth_gssapi (struct imap4d_command *command, char **username)
      util_send ("+ %*.*s\r\n", size, size, tmp);
      free (tmp);
      gss_release_buffer (&min_stat, &outbuf);
-      token_str = imap4d_readline_ex (ifile);
+      token_str = imap4d_readline_ex ();
      free (token_str);
    }
@@ -205,15 +197,15 @@ auth_gssapi (struct imap4d_command *command, char **username)
  util_send ("+ %*.*s\r\n", size, size, tmp);
  free (tmp);
-  token_str = imap4d_readline_ex (ifile);
+  token_str = imap4d_readline_ex ();
  util_base64_decode (token_str, strlen (token_str),
-		      (unsigned char **)&tokbuf.value, &tokbuf.length);
+		      (unsigned char **) &tokbuf.value, &tokbuf.length);
  free (token_str);
  gss_unwrap (&min_stat, context, &tokbuf, &outbuf, &cflags, &quality);
  free (tokbuf.value);
-  sec_level = ntohl (*(OM_uint32*)outbuf.value);
+  sec_level = ntohl (*(OM_uint32 *) outbuf.value);
  /* FIXME: parse sec_level and act accordingly to its settings */
  mech = sec_level >> 24;
@@ -226,25 +218,23 @@ auth_gssapi (struct imap4d_command *command, char **username)
      maj_stat = gss_delete_sec_context (&min_stat, &context, &outbuf);
      gss_release_buffer (&min_stat, &outbuf);
      util_finish (command, RESP_NO,
-	  "GSSAPI authentication failed: unsupported protection mechanism");
+		   "GSSAPI authentication failed: unsupported protection mechanism");
      return 1;
    }
  protection_mech = mech;
  client_buffer_size = sec_level & 0x00ffffffff;
-  *username = strdup ((char*)outbuf.value + 4);
+  *username = strdup ((char *) outbuf.value + 4);
  gss_release_buffer (&min_stat, &outbuf);
-  maj_stat = gss_display_name(&min_stat, client,
+  maj_stat = gss_display_name (&min_stat, client, &client_name, &mech_type);
-			      &client_name, &mech_type);
  if (maj_stat != GSS_S_COMPLETE)
    {
      display_status ("get client name", maj_stat, min_stat);
      maj_stat = gss_delete_sec_context (&min_stat, &context, &outbuf);
      gss_release_buffer (&min_stat, &outbuf);
      free (*username);
-      util_finish (command, RESP_NO,
+      util_finish (command, RESP_NO, "GSSAPI authentication failed");
-		   "GSSAPI authentication failed");
      return 1;
    }
@@ -270,8 +260,6 @@ auth_gssapi (struct imap4d_command *command, char **username)
  gss_release_buffer (&min_stat, &client_name);
  maj_stat = gss_delete_sec_context (&min_stat, &context, &outbuf);
  gss_release_buffer (&min_stat, &outbuf);
-  util_finish (command, RESP_OK,
+  util_finish (command, RESP_OK, "GSSAPI authentication successful");
-	       "GSSAPI authentication successful");
  return 0;
 }
--- a/imap4d/bye.c
View file @6b97e35
+++ b/imap4d/bye.c
View file @6b97e35
@@ -44,7 +44,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command)
      break;
    case ERR_SIGNAL:
-      if (ofile) 
+      if (util_is_ofile())
 	util_out (RESP_BYE, "Quitting on signal");
      syslog (LOG_ERR, _("Quitting on signal"));
      break;
@@ -78,6 +78,14 @@ imap4d_bye0 (int reason, struct imap4d_command *command)
  if (status == EXIT_SUCCESS && command)
     util_finish (command, RESP_OK, "Completed");
+#ifdef WITH_TLS
+  if (tls_done)
+    imap4d_deinit_tls_server ();
+  if (tls_available)
+    mu_deinit_tls_libs ();
+#endif /* WITH_TLS */
  closelog ();
  exit (status);
 }
--- a/imap4d/capability.c
View file @6b97e35
+++ b/imap4d/capability.c
View file @6b97e35
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2003 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
@@ -13,7 +13,7 @@
   You should have received a copy of the GNU General Public License
   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
 #include "imap4d.h"
@@ -28,13 +28,20 @@ int
 imap4d_capability (struct imap4d_command *command, char *arg)
 {
  int i;
-  (void)arg;
+  (void) arg;
  util_send ("* CAPABILITY");
  for (i = 0; capa[i]; i++)
-    util_send(" %s", capa[i]);
+    util_send (" %s", capa[i]);
+#ifdef WITH_TLS
+  if (tls_available)
+    util_send (" STARTTLS");
+#endif /* WITH_TLS */
  imap4d_auth_capability ();
-  util_send("\r\n");
+  util_send ("\r\n");
  return util_finish (command, RESP_OK, "Completed");
 }
--- a/imap4d/commands.c
View file @6b97e35
+++ b/imap4d/commands.c
View file @6b97e35
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2003 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
@@ -13,7 +13,7 @@
   You should have received a copy of the GNU General Public License
   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
 #include "imap4d.h"
@@ -45,5 +45,8 @@ struct imap4d_command imap4d_command_table [] =
  { "UID", imap4d_uid, STATE_SEL, STATE_NONE, STATE_NONE, NULL },
  { "NAMESPACE", imap4d_namespace, STATE_AUTH | STATE_SEL, STATE_NONE, STATE_NONE, NULL },
  { "X-VERSION", imap4d_version, STATE_AUTH | STATE_SEL, STATE_NONE, STATE_NONE, NULL },
+#ifdef WITH_TLS
+  { "STARTTLS", imap4d_starttls, STATE_NONAUTH, STATE_NONE, STATE_NONE, NULL },
+#endif /* WITH_TLS */
  { NULL, 0, 0, 0, 0, NULL }
 };
--- a/imap4d/imap4d.c
View file @6b97e35
+++ b/imap4d/imap4d.c
View file @6b97e35
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 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
@@ -13,47 +13,50 @@
   You should have received a copy of the GNU General Public License
   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
 #include "imap4d.h"
-FILE *ifile;
-FILE *ofile;
 mailbox_t mbox;
 char *homedir;
 int state = STATE_NONAUTH;
 int debug_mode = 0;
-struct mu_auth_data *auth_data; 
+struct mu_auth_data *auth_data;
 struct daemon_param daemon_param = {
-  MODE_INTERACTIVE,     /* Start in interactive (inetd) mode */
+  MODE_INTERACTIVE,		/* Start in interactive (inetd) mode */
-  20,                   /* Default maximum number of children */
+  20,				/* Default maximum number of children */
-  143,                  /* Standard IMAP4 port */
+  143,				/* Standard IMAP4 port */
-  1800,                 /* RFC2060: 30 minutes. */
+  1800,				/* RFC2060: 30 minutes. */
-  0                     /* No transcript by default */
+  0				/* No transcript by default */
 };
+#ifdef WITH_TLS
+int tls_available;
+int tls_done;
+#endif /* WITH_TLS */
 /* Number of child processes.  */
 volatile size_t children;
 const char *argp_program_version = "imap4d (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU imap4d -- the IMAP4D daemon");
-static struct argp_option options[] = 
+static struct argp_option options[] = {
-{
  {"other-namespace", 'O', N_("PATHLIST"), 0,
   N_("set the `other' namespace"), 0},
  {"shared-namespace", 'S', N_("PATHLIST"), 0,
   N_("set the `shared' namespace"), 0},
-  { NULL,      0, NULL, 0, NULL, 0 }
+  {NULL, 0, NULL, 0, NULL, 0}
 };
-static error_t imap4d_parse_opt (int key, char *arg, struct argp_state *state);
+static error_t imap4d_parse_opt (int key, char *arg,
+				 struct argp_state *state);
 static struct argp argp = {
  options,
  imap4d_parse_opt,
-  NULL, 
+  NULL,
  doc,
  NULL,
  NULL, NULL
@@ -62,6 +65,9 @@ static struct argp argp = {
 static const char *imap4d_capa[] = {
  "daemon",
  "auth",
+#ifdef WITH_TLS
+  "tls",
+#endif /* WITH_TLS */
  "common",
  "mailbox",
  "logging",
@@ -69,10 +75,10 @@ static const char *imap4d_capa[] = {
  NULL
 };
-static int imap4d_mainloop      __P ((int, int));
+static int imap4d_mainloop __P ((int, int));
-static void imap4d_daemon_init  __P ((void));
+static void imap4d_daemon_init __P ((void));
-static void imap4d_daemon       __P ((unsigned int, unsigned int));
+static void imap4d_daemon __P ((unsigned int, unsigned int));
-static int imap4d_mainloop      __P ((int, int));
+static int imap4d_mainloop __P ((int, int));
 static error_t
 imap4d_parse_opt (int key, char *arg, struct argp_state *state)
@@ -82,15 +88,15 @@ imap4d_parse_opt (int key, char *arg, struct argp_state *state)
    case ARGP_KEY_INIT:
      state->child_inputs[0] = state->input;
      break;
    case 'O':
      set_namespace (NS_OTHER, arg);
      break;
    case 'S':
      set_namespace (NS_SHARED, arg);
      break;
    default:
      return ARGP_ERR_UNKNOWN;
    }
@@ -106,9 +112,12 @@ main (int argc, char **argv)
  /* Native Language Support */
  mu_init_nls ();
-  state = STATE_NONAUTH; /* Starting state in non-auth.  */
+  state = STATE_NONAUTH;	/* Starting state in non-auth.  */
-  MU_AUTH_REGISTER_ALL_MODULES();
+  MU_AUTH_REGISTER_ALL_MODULES ();
+#ifdef WITH_TLS
+  mu_tls_init_argp ();
+#endif /* WITH_TLS */
  mu_argp_parse (&argp, &argc, &argv, 0, imap4d_capa, NULL, &daemon_param);
 #ifdef USE_LIBPAM
@@ -131,7 +140,7 @@ main (int argc, char **argv)
 	  perror (_("Error getting mail group"));
 	  exit (1);
 	}
      if (setgid (gr->gr_gid) == -1)
 	{
 	  perror (_("Error setting mail group"));
@@ -143,7 +152,7 @@ main (int argc, char **argv)
  {
    list_t bookie;
    registrar_get_list (&bookie);
-    list_append (bookie, mbox_record); 
+    list_append (bookie, mbox_record);
    list_append (bookie, path_record);
  }
@@ -174,8 +183,15 @@ main (int argc, char **argv)
  /* Redirect any stdout error from the library to syslog, they
     should not go to the client.  */
  mu_error_set_print (mu_syslog_error_printer);
-  umask (S_IROTH | S_IWOTH | S_IXOTH);  /* 007 */
+  umask (S_IROTH | S_IWOTH | S_IXOTH);	/* 007 */
+  /* Check TLS environment, i.e. cert and key files */
+#ifdef WITH_TLS
+  tls_available = mu_check_tls_environment ();
+  if (tls_available)
+    tls_available = mu_init_tls_libs ();
+#endif /* WITH_TLS */
  /* Actually run the daemon.  */
  if (daemon_param.mode == MODE_DAEMON)
@@ -194,18 +210,13 @@ static int
 imap4d_mainloop (int infile, int outfile)
 {
  char *text;
  /* Reset hup to exit.  */
  signal (SIGHUP, imap4d_signal);
  /* Timeout alarm.  */
  signal (SIGALRM, imap4d_signal);
-  ifile = fdopen (infile, "r");
+  util_setio (infile, outfile);
-  ofile = fdopen (outfile, "w");
-  if (!ofile || !ifile)
-    imap4d_bye (ERR_NO_OFILE);
-  setvbuf(ofile, NULL, _IOLBF, 0);
  /* log information on the connecting client */
  if (!debug_mode)
@@ -214,11 +225,11 @@ imap4d_mainloop (int infile, int outfile)
      int len = sizeof cs;
      syslog (LOG_INFO, _("Incoming connection opened"));
-      if (getpeername (infile, (struct sockaddr*)&cs, &len) < 0)
+      if (getpeername (infile, (struct sockaddr *) &cs, &len) < 0)
 	syslog (LOG_ERR, _("can't obtain IP address of client: %s"),
 		strerror (errno));
      else
-	syslog (LOG_INFO, _("connect from %s"), inet_ntoa(cs.sin_addr));
+	syslog (LOG_INFO, _("connect from %s"), inet_ntoa (cs.sin_addr));
      text = "IMAP4rev1";
    }
  else
@@ -226,23 +237,22 @@ imap4d_mainloop (int infile, int outfile)
      syslog (LOG_INFO, _("Started in debugging mode"));
      text = "IMAP4rev1 Debugging mode";
    }
  /* Greetings.  */
  util_out (RESP_OK, text);
-  fflush (ofile);
+  util_flush_output ();
  while (1)
    {
-      char *cmd = imap4d_readline (ifile);
+      char *cmd = imap4d_readline ();
      /* check for updates */
      imap4d_sync ();
      util_do_command (cmd);
      imap4d_sync ();
      free (cmd);
-      fflush (ofile);
+      util_flush_output ();
    }
-  closelog ();
  return EXIT_SUCCESS;
 }
@@ -256,7 +266,7 @@ imap4d_daemon_init (void)
     first three one, in, out, err   */
  if (daemon (0, 0) < 0)
    {
-      perror(_("fork failed:"));
+      perror (_("fork failed:"));
      exit (1);
    }
@@ -289,18 +299,18 @@ imap4d_daemon (unsigned int maxchildren, unsigned int port)
  listenfd = socket (AF_INET, SOCK_STREAM, 0);
  if (listenfd == -1)
    {
-      syslog (LOG_ERR, "socket: %s", strerror(errno));
+      syslog (LOG_ERR, "socket: %s", strerror (errno));
      exit (1);
    }
-  size = 1; /* Use size here to avoid making a new variable.  */
+  size = 1;			/* Use size here to avoid making a new variable.  */
-  setsockopt (listenfd, SOL_SOCKET, SO_REUSEADDR, &size, sizeof(size));
+  setsockopt (listenfd, SOL_SOCKET, SO_REUSEADDR, &size, sizeof (size));
  size = sizeof (server);
  memset (&server, 0, size);
  server.sin_family = AF_INET;
  server.sin_addr.s_addr = htonl (INADDR_ANY);
  server.sin_port = htons (port);
-  if (bind (listenfd, (struct sockaddr *)&server, size) == -1)
+  if (bind (listenfd, (struct sockaddr *) &server, size) == -1)
    {
      syslog (LOG_ERR, "bind: %s", strerror (errno));
      exit (1);
@@ -315,38 +325,37 @@ imap4d_daemon (unsigned int maxchildren, unsigned int port)
  for (;;)
    {
      if (children > maxchildren)
-        {
+	{
-          syslog (LOG_ERR, _("too many children (%lu)"),
+	  syslog (LOG_ERR, _("too many children (%lu)"),
 		  (unsigned long) children);
-          pause ();
+	  pause ();
-          continue;
+	  continue;
-        }
+	}
-      connfd = accept (listenfd, (struct sockaddr *)&client,
+      connfd = accept (listenfd, (struct sockaddr *) &client,
-		       (socklen_t*) &size);
+		       (socklen_t *) & size);
      if (connfd == -1)
-        {
+	{
-          if (errno == EINTR)
+	  if (errno == EINTR)
-            continue;
+	    continue;
-          syslog (LOG_ERR, "accept: %s", strerror (errno));
+	  syslog (LOG_ERR, "accept: %s", strerror (errno));
-          exit (1);
+	  exit (1);
-        }
+	}
      pid = fork ();
      if (pid == -1)
-        syslog(LOG_ERR, "fork: %s", strerror (errno));
+	syslog (LOG_ERR, "fork: %s", strerror (errno));
-      else if (pid == 0) /* Child.  */
+      else if (pid == 0)	/* Child.  */
-        {
+	{
-          int status;
+	  int status;
-          close (listenfd);
+	  close (listenfd);
-          status = imap4d_mainloop (connfd, connfd);
+	  status = imap4d_mainloop (connfd, connfd);
-          closelog ();
+	  closelog ();
-          exit (status);
+	  exit (status);
-        }
+	}
      else
-        {
+	{
-          ++children;
+	  ++children;
-        }
+	}
      close (connfd);
    }
 }
--- a/imap4d/imap4d.h
View file @6b97e35
+++ b/imap4d/imap4d.h
View file @6b97e35
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 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
@@ -13,7 +13,7 @@
   You should have received a copy of the GNU General Public License
   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
 #ifndef _IMAP4D_H
 #define _IMAP4D_H 1
@@ -87,6 +87,7 @@
 #include <mailutils/stream.h>
 #include <mailutils/mu_auth.h>
 #include <mailutils/url.h>
+#include <mailutils/tls.h>
 #include <mailutils/nls.h>
 #ifdef __cplusplus
@@ -126,7 +127,8 @@ struct imap4d_command
 #define ERR_NO_OFILE 2
 #define ERR_TIMEOUT 3
 #define ERR_SIGNAL 4
+#define ERR_TLS 5
 /* Namespace numbers */
 #define NS_PRIVATE 0
 #define NS_OTHER   1
@@ -139,8 +141,6 @@ struct imap4d_command
 #define WCARD_RECURSE_MATCH  2
 extern struct imap4d_command imap4d_command_table[];
-extern FILE *ifile;
-extern FILE *ofile;
 extern mailbox_t mbox;
 extern char *homedir;
 extern char *rootdir;
@@ -149,7 +149,12 @@ extern volatile size_t children;
 extern int is_virtual;
 extern struct daemon_param daemon_param;
 extern struct mu_auth_data *auth_data; 
+#ifdef WITH_TLS
+extern int tls_available;
+extern int tls_done;
+#endif /* WITH_TLS */
 #ifndef HAVE_STRTOK_R
 extern char *strtok_r __P((char *s, const char *delim, char **save_ptr));
 #endif
@@ -181,6 +186,9 @@ extern int  imap4d_search0 __P((char *arg, int isuid, char *replybuf, size_t rep
 extern int  imap4d_select __P ((struct imap4d_command *, char *));
 extern int  imap4d_select0 __P ((struct imap4d_command *, char *, int));
 extern int  imap4d_select_status __P((void));
+#ifdef WITH_TLS
+extern int  imap4d_starttls __P ((struct imap4d_command *, char *));
+#endif /* WITH_TLS */
 extern int  imap4d_status __P ((struct imap4d_command *, char *));
 extern int  imap4d_store __P ((struct imap4d_command *, char *));
 extern int  imap4d_store0 __P ((char *, int, char *, size_t));
@@ -220,8 +228,8 @@ extern int  util_start __P ((char *));
 extern int  util_finish __P ((struct imap4d_command *, int, const char *, ...));
 extern int  util_getstate __P ((void));
 extern int  util_do_command __P ((char *));
-extern char *imap4d_readline __P ((FILE*));
+extern char *imap4d_readline __P ((void));
-extern char *imap4d_readline_ex __P ((FILE*));
+extern char *imap4d_readline_ex __P ((void));
 extern char *util_getword __P ((char *, char **));
 extern char *util_getitem __P ((char *, const char *, char **));
 extern int  util_token __P ((char *, size_t, char **));
@@ -256,7 +264,15 @@ int util_attribute_to_type __P((const char *item, int *type));
 int util_type_to_attribute __P((int type, char **attr_str));
 int util_attribute_matches_flag __P((attribute_t attr, const char *item));
 int util_uidvalidity __P((mailbox_t smbox, unsigned long *uidvp));
+void util_setio __P((int, int));
+void util_flush_output __P((void));
+FILE *util_is_ofile __P((void));
+#ifdef WITH_TLS
+int imap4d_init_tls_server __P((void));
+void imap4d_deinit_tls_server __P((void));
+#endif /* WITH_TLS */
 #ifdef __cplusplus
 }
 #endif
--- a/imap4d/signal.c
View file @6b97e35
+++ b/imap4d/signal.c
View file @6b97e35
@@ -41,7 +41,7 @@ imap4d_signal (int signo)
 {
  syslog (LOG_CRIT, _("got signal %s"), strsignal (signo));
  /* Master process.  */
-  if (!ofile)
+  if (!(util_is_ofile()))
    {
      syslog (LOG_CRIT, _("MASTER: exiting on signal"));
      exit (1);			/* abort(); */
--- a/imap4d/starttls.c 0 → 100644
View file @6b97e35
+++ b/imap4d/starttls.c 0 → 100644
View file @6b97e35
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2003 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 2, 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 GNU Mailutils; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+#include "imap4d.h"
+#ifdef WITH_TLS
+int
+imap4d_starttls (struct imap4d_command *command, char *arg)
+{
+  int status;
+  char *sp = NULL;
+  if (!tls_available || tls_done)
+    return util_finish (command, RESP_BAD, "Invalid command");
+  if (util_getword (arg, &sp))
+    return util_finish (command, RESP_BAD, "Too many args");
+  status = util_finish (command, RESP_OK, "Begin TLS negotiation");
+  tls_done = imap4d_init_tls_server ();
+  return status;
+}
+#endif /* WITH_TLS */
+/* EOF */
--- a/imap4d/util.c
View file @6b97e35
+++ b/imap4d/util.c
View file @6b97e35