← Back to branch summary

~ubuntu-branches/ubuntu/vivid/exim4/vivid

« back to all changes in this revision

Viewing changes to .pc/50_localscan_dlopen.dpatch/src/globals.c

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2014-08-04 11:48:39 UTC
  • mfrom: (56.1.2 utopic)
  • Revision ID: package-import@ubuntu.com-20140804114839-xoulpcx9nxi5m72u
Tags: 4.84~RC1-3ubuntu1
https://launchpad.net/bugs/1351470
* Merge from Debian unstable (LP: #1351470). Remaining changes:
  - Show Ubuntu distribution on smtp:
    + debian/patches/fix_smtp_banner.patch: updated SMTP banner
      with Ubuntu distribution
    + debian/control: added lsb-release build dependency
  - Don't provide default-mta; in Ubuntu, we want postfix to be the
    default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/50_localscan_dlopen.dpatch/src/globals.c
2
2
*     Exim - an Internet mail transport agent    *
3
3
*************************************************/
4
4
 
5
 
/* Copyright (c) University of Cambridge 1995 - 2012 */
 
5
/* Copyright (c) University of Cambridge 1995 - 2014 */
6
6
/* See the file NOTICE for conditions of use and distribution. */
7
7
 
8
8
/* All the global variables are defined together in this one module, so
106
106
 NULL, /* tls_cipher */
107
107
 FALSE,/* tls_on_connect */
108
108
 NULL, /* tls_on_connect_ports */
 
109
 NULL, /* tls_ourcert */
 
110
 NULL, /* tls_peercert */
109
111
 NULL, /* tls_peerdn */
110
 
 NULL  /* tls_sni */
 
112
 NULL, /* tls_sni */
 
113
 0     /* tls_ocsp */
111
114
};
112
115
tls_support tls_out = {
113
116
 -1,   /* tls_active */
116
119
 NULL, /* tls_cipher */
117
120
 FALSE,/* tls_on_connect */
118
121
 NULL, /* tls_on_connect_ports */
 
122
 NULL, /* tls_ourcert */
 
123
 NULL, /* tls_peercert */
119
124
 NULL, /* tls_peerdn */
120
 
 NULL  /* tls_sni */
 
125
 NULL, /* tls_sni */
 
126
 0     /* tls_ocsp */
121
127
};
122
128
 
 
129
#ifdef EXPERIMENTAL_DSN
 
130
uschar *dsn_envid              = NULL;
 
131
int     dsn_ret                = 0;
 
132
const pcre  *regex_DSN         = NULL;
 
133
BOOL    smtp_use_dsn           = FALSE;
 
134
uschar *dsn_advertise_hosts    = NULL;
 
135
#endif
123
136
 
124
137
#ifdef SUPPORT_TLS
125
138
BOOL    gnutls_compat_mode     = FALSE;
137
150
bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */
138
151
int     tls_dh_max_bits        = 2236;
139
152
uschar *tls_dhparam            = NULL;
140
 
#if defined(EXPERIMENTAL_OCSP) && !defined(USE_GNUTLS)
 
153
#ifndef DISABLE_OCSP
141
154
uschar *tls_ocsp_file          = NULL;
142
155
#endif
143
156
BOOL    tls_offered            = FALSE;
149
162
uschar *tls_verify_hosts       = NULL;
150
163
#endif
151
164
 
152
 
#ifdef EXPERIMENTAL_PRDR
 
165
#ifndef DISABLE_PRDR
153
166
/* Per Recipient Data Response variables */
154
167
BOOL    prdr_enable            = FALSE;
155
168
BOOL    prdr_requested         = FALSE;
212
225
uschar *acl_smtp_auth          = NULL;
213
226
uschar *acl_smtp_connect       = NULL;
214
227
uschar *acl_smtp_data          = NULL;
215
 
#ifdef EXPERIMENTAL_PRDR
 
228
#ifndef DISABLE_PRDR
216
229
uschar *acl_smtp_data_prdr     = NULL;
217
230
#endif
218
231
#ifndef DISABLE_DKIM
248
261
                                   US"MIME",
249
262
                                   US"DKIM",
250
263
                                   US"DATA",
251
 
#ifdef EXPERIMENTAL_PRDR
 
264
#ifndef DISABLE_PRDR
252
265
                                   US"PRDR",
253
266
#endif
254
267
                                   US"non-SMTP",
273
286
                                   US"550",     /* MIME */
274
287
                                   US"550",     /* DKIM */
275
288
                                   US"550",     /* DATA */
276
 
#ifdef EXPERIMENTAL_PRDR
 
289
#ifndef DISABLE_PRDR
277
290
                                   US"550",    /* RCPT PRDR */
278
291
#endif
279
292
                                   US"0",       /* not SMTP; not relevant */
332
345
  NULL,                 /* shadow_message */
333
346
  #ifdef SUPPORT_TLS
334
347
  NULL,                 /* cipher */
 
348
  NULL,                 /* ourcert */
 
349
  NULL,                 /* peercert */
335
350
  NULL,                 /* peerdn */
 
351
  OCSP_NOT_REQ,         /* ocsp */
336
352
  #endif
337
353
  NULL,                 /* authenticator */
338
354
  NULL,                 /* auth_id */
339
355
  NULL,                 /* auth_sndr */
 
356
  #ifdef EXPERIMENTAL_DSN
 
357
  NULL,                 /* dsn_orcpt */
 
358
  0,                    /* dsn_flags */
 
359
  0,                    /* dsn_aware */
 
360
  #endif
340
361
  (uid_t)(-1),          /* uid */
341
362
  (gid_t)(-1),          /* gid */
342
363
  0,                    /* flags */
552
573
BOOL    deliver_firsttime      = FALSE;
553
574
BOOL    deliver_force          = FALSE;
554
575
BOOL    deliver_freeze         = FALSE;
555
 
int     deliver_frozen_at      = 0;
 
576
time_t  deliver_frozen_at      = 0;
556
577
uschar *deliver_home           = NULL;
557
578
uschar *deliver_host           = NULL;
558
579
uschar *deliver_host_address   = NULL;
598
619
#ifdef EXPERIMENTAL_DMARC
599
620
BOOL    dmarc_has_been_checked  = FALSE;
600
621
uschar *dmarc_ar_header         = NULL;
 
622
uschar *dmarc_domain_policy     = NULL;
601
623
uschar *dmarc_forensic_sender   = NULL;
602
624
uschar *dmarc_history_file      = NULL;
603
625
uschar *dmarc_status            = NULL;
797
819
  { US"lost_incoming_connection",     L_lost_incoming_connection },
798
820
  { US"outgoing_port",                LX_outgoing_port },
799
821
  { US"pid",                          LX_pid },
 
822
#ifdef EXPERIMENTAL_PROXY
 
823
  { US"proxy",                        LX_proxy },
 
824
#endif
800
825
  { US"queue_run",                    L_queue_run },
801
826
  { US"queue_time",                   LX_queue_time },
802
827
  { US"queue_time_overall",           LX_queue_time_overall },
833
858
BOOL    log_timezone           = FALSE;
834
859
unsigned int log_write_selector= L_default;
835
860
uschar *login_sender_address   = NULL;
 
861
uschar *lookup_dnssec_authenticated = NULL;
836
862
int     lookup_open_max        = 25;
837
863
uschar *lookup_value           = NULL;
838
864
 
914
940
int     process_info_len       = 0;
915
941
uschar *process_log_path       = NULL;
916
942
BOOL    prod_requires_admin    = TRUE;
 
943
 
 
944
#ifdef EXPERIMENTAL_PROXY
 
945
uschar *proxy_host_address     = US"";
 
946
int     proxy_host_port        = 0;
 
947
uschar *proxy_required_hosts   = US"";
 
948
BOOL    proxy_session          = FALSE;
 
949
BOOL    proxy_session_failed   = FALSE;
 
950
uschar *proxy_target_address   = US"";
 
951
int     proxy_target_port      = 0;
 
952
#endif
 
953
 
917
954
uschar *prvscheck_address      = NULL;
918
955
uschar *prvscheck_keynum       = NULL;
919
956
uschar *prvscheck_result       = NULL;
1092
1129
    TRUE,                      /* verify_sender */
1093
1130
    FALSE,                     /* uid_set */
1094
1131
    FALSE,                     /* unseen */
 
1132
#ifdef EXPERIMENTAL_DSN
 
1133
    FALSE,                     /* dsn_lasthop */
 
1134
#endif
1095
1135
 
1096
1136
    self_freeze,               /* self_code */
1097
1137
    (uid_t)(-1),               /* uid */
1347
1387
    FALSE,                    /* log_defer_output */
1348
1388
    TRUE_UNSET                /* retry_use_local_part: BOOL, but set neither
1349
1389
                                 1 nor 0 so can detect unset */
 
1390
#ifdef EXPERIMENTAL_TPDA
 
1391
   ,NULL                      /* tpda_delivery_action */
 
1392
#endif
1350
1393
};
1351
1394
 
1352
1395
int     transport_count;
1403
1446
BOOL    write_rejectlog        = TRUE;
1404
1447
 
1405
1448
uschar *version_copyright      =
1406
 
 US"Copyright (c) University of Cambridge, 1995 - 2013\n"
1407
 
   "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2013";
 
1449
 US"Copyright (c) University of Cambridge, 1995 - 2014\n"
 
1450
   "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2014";
1408
1451
uschar *version_date           = US"?";
1409
1452
uschar *version_cnumber        = US"????";
1410
1453
uschar *version_string         = US"?";