← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/exim4/oneiric

« back to all changes in this revision

Viewing changes to src/acl.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2010-12-28 22:20:17 UTC
  • mfrom: (2.3.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20101228222017-r6vg4eqlqy2fk4ul
Tags: 4.73~rc1-1ubuntu1
https://launchpad.net/bugs/697934
http://bugs.debian.org/542726
* Merge from debian unstable.  Remaining changes: (LP: #697934)
  - debian/patches/71_exiq_grep_error_on_messages_without_size.patch:
    + Improve handling of broken messages when "exim4 -bp" (mailq)
      reports lines without size info.
  - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
    we want postfix to be the default.
  - debian/{control,rules}: Add and enable hardened build for PIE.
    (Closes: #542726)
* Drop B-D on libmysqlclient15-dev, resolved in Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/acl.c
1
 
/* $Cambridge: exim/exim-src/src/acl.c,v 1.87 2009/11/16 19:50:36 nm4 Exp $ */
 
1
/* $Cambridge: exim/src/src/acl.c,v 1.88 2010/06/06 00:27:52 pdp Exp $ */
2
2
 
3
3
/*************************************************
4
4
*     Exim - an Internet mail transport agent    *
171
171
  #ifdef EXPERIMENTAL_BRIGHTMAIL
172
172
  CONTROL_BMI_RUN,
173
173
  #endif
 
174
  CONTROL_DEBUG,
174
175
  #ifndef DISABLE_DKIM
175
176
  CONTROL_DKIM_VERIFY,
176
177
  #endif
204
205
  #ifdef EXPERIMENTAL_BRIGHTMAIL
205
206
  US"bmi_run",
206
207
  #endif
 
208
  US"debug",
207
209
  #ifndef DISABLE_DKIM
208
210
  US"dkim_disable_verify",
209
211
  #endif
517
519
  0,                                               /* bmi_run */
518
520
  #endif
519
521
 
 
522
  0,                                               /* debug */
 
523
 
520
524
  #ifndef DISABLE_DKIM
521
525
  (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|      /* dkim_disable_verify */
522
526
    (1<<ACL_WHERE_NOTSMTP_START),
598
602
#ifdef EXPERIMENTAL_BRIGHTMAIL
599
603
  { US"bmi_run",                 CONTROL_BMI_RUN, FALSE },
600
604
#endif
 
605
  { US"debug",                   CONTROL_DEBUG, TRUE },
601
606
#ifndef DISABLE_DKIM
602
607
  { US"dkim_disable_verify",     CONTROL_DKIM_VERIFY, FALSE },
603
608
#endif
2416
2421
{
2417
2422
uschar *user_message = NULL;
2418
2423
uschar *log_message = NULL;
 
2424
uschar *debug_tag = NULL;
 
2425
uschar *debug_opts = NULL;
2419
2426
uschar *p = NULL;
2420
2427
int rc = OK;
2421
2428
#ifdef WITH_CONTENT_SCAN
2703
2710
        }
2704
2711
      break;
2705
2712
 
 
2713
      case CONTROL_DEBUG:
 
2714
      while (*p == '/')
 
2715
        {
 
2716
        if (Ustrncmp(p, "/tag=", 5) == 0)
 
2717
          {
 
2718
          uschar *pp = p + 5;
 
2719
          while (*pp != '\0' && *pp != '/') pp++;
 
2720
          debug_tag = string_copyn(p+5, pp-p-5);
 
2721
          p = pp;
 
2722
          }
 
2723
        else if (Ustrncmp(p, "/opts=", 6) == 0)
 
2724
          {
 
2725
          uschar *pp = p + 6;
 
2726
          while (*pp != '\0' && *pp != '/') pp++;
 
2727
          debug_opts = string_copyn(p+6, pp-p-6);
 
2728
          p = pp;
 
2729
          }
 
2730
        }
 
2731
        debug_logging_activate(debug_tag, debug_opts);
 
2732
      break;
 
2733
 
2706
2734
      case CONTROL_SUPPRESS_LOCAL_FIXUPS:
2707
2735
      suppress_local_fixups = TRUE;
2708
2736
      break;