← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/32_exim4.dpatch/src/globals.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:
.pc/32_exim4.dpatch/src/globals.c
1
 
/* $Cambridge: exim/exim-src/src/globals.c,v 1.86 2009/11/16 19:50:37 nm4 Exp $ */
 
1
/* $Cambridge: exim/src/src/globals.c,v 1.88 2010/06/12 15:21:26 jetmore Exp $ */
2
2
 
3
3
/*************************************************
4
4
*     Exim - an Internet mail transport agent    *
115
115
uschar *gnutls_require_mac     = NULL;
116
116
uschar *gnutls_require_kx      = NULL;
117
117
uschar *gnutls_require_proto   = NULL;
 
118
uschar *openssl_options        = NULL;
118
119
const pcre *regex_STARTTLS     = NULL;
119
120
uschar *tls_advertise_hosts    = NULL;    /* This is deliberate */
120
121
uschar *tls_certificate        = NULL;
929
930
const pcre *regex_SIZE         = NULL;
930
931
const pcre *regex_smtp_code    = NULL;
931
932
const pcre *regex_ismsgid      = NULL;
 
933
#ifdef WHITELIST_D_MACROS
 
934
const pcre *regex_whitelisted_macro = NULL;
 
935
#endif
932
936
#ifdef WITH_CONTENT_SCAN
933
937
uschar *regex_match_string     = NULL;
934
938
#endif
945
949
uschar *rfc1413_hosts          = US"*";
946
950
int     rfc1413_query_timeout  = 5;
947
951
/* BOOL    rfc821_domains         = FALSE;  <<< on the way out */
 
952
uid_t   root_gid               = ROOT_GID;
948
953
uid_t   root_uid               = ROOT_UID;
949
954
 
950
955
router_instance  *routers  = NULL;
1187
1192
 
1188
1193
gid_t   system_filter_gid      = 0;
1189
1194
BOOL    system_filter_gid_set  = FALSE;
1190
 
uid_t   system_filter_uid      = 0;
 
1195
uid_t   system_filter_uid      = (uid_t)-1;
1191
1196
BOOL    system_filter_uid_set  = FALSE;
1192
1197
BOOL    system_filtering       = FALSE;
1193
1198
 
1194
1199
BOOL    tcp_nodelay            = TRUE;
 
1200
#ifdef USE_TCP_WRAPPERS
 
1201
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
 
1202
#endif
1195
1203
int     test_harness_load_avg  = 0;
1196
1204
int     thismessage_size_limit = 0;
1197
1205
int     timeout_frozen_after   = 0;
1263
1271
tree_node  *tree_unusable      = NULL;
1264
1272
 
1265
1273
BOOL    trusted_caller         = FALSE;
 
1274
BOOL    trusted_config         = TRUE;
1266
1275
gid_t  *trusted_groups         = NULL;
1267
1276
uid_t  *trusted_users          = NULL;
1268
1277
uschar *timezone_string        = US TIMEZONE_DEFAULT;