[exim-cvs] cvs commit: exim/exim-src/exim_monitor em_globals…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Tom Kistner
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-src/exim_monitor em_globals.c
tom 2009/06/15 20:54:32 BST

  Modified files:
    exim-src/exim_monitor em_globals.c 
  Log:
  Fixup eximon compile. Thanks Graeme.


  Revision  Changes    Path
  1.15      +7 -10     exim/exim-src/exim_monitor/em_globals.c


  Index: em_globals.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/exim_monitor/em_globals.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- em_globals.c    30 Dec 2008 13:12:02 -0000    1.14
  +++ em_globals.c    15 Jun 2009 19:54:32 -0000    1.15
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/exim_monitor/em_globals.c,v 1.14 2008/12/30 13:12:02 michael Exp $ */
  +/* $Cambridge: exim/exim-src/exim_monitor/em_globals.c,v 1.15 2009/06/15 19:54:32 tom Exp $ */


   /*************************************************
   *                Exim Monitor                    *
  @@ -135,16 +135,13 @@
   int     deliver_frozen_at      = 0;
   BOOL    deliver_manual_thaw    = FALSE;


  -#ifdef EXPERIMENTAL_DOMAINKEYS
  -uschar *dk_signing_domain      = NULL;
  -uschar *dk_signing_selector    = NULL;
  -int     dk_do_verify           = 0;
  -#endif
  -
  -#ifdef EXPERIMENTAL_DKIM
  -uschar *dkim_signing_domain    = NULL;
  -uschar *dkim_signing_selector  = NULL;
  -int dkim_do_verify             = 0;
  +#ifndef DISABLE_DKIM
  +uschar *dkim_signing_domains     = NULL;
  +uschar *dkim_signing_domain      = NULL;
  +uschar *dkim_signing_selector    = NULL;
  +uschar *dkim_verify_signers      = US"$dkim_signing_domains";
  +BOOL    dkim_collect_input       = FALSE;
  +BOOL    dkim_disable_verify      = FALSE;
   #endif


   BOOL    dont_deliver           = FALSE;