git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement -D filtering, first pass.
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 9b77d876b202495e10c3a37cf928e2651a30abc3..71de52aaccd3637a5fc4dc2ab45f4193cf4497d4 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-930,6
+930,9
@@
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_smtp_code = NULL;
const pcre *regex_ismsgid = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_smtp_code = NULL;
const pcre *regex_ismsgid = NULL;
+#ifdef WHITELIST_D_MACROS
+const pcre *regex_whitelisted_macro = NULL;
+#endif
#ifdef WITH_CONTENT_SCAN
uschar *regex_match_string = NULL;
#endif
#ifdef WITH_CONTENT_SCAN
uschar *regex_match_string = NULL;
#endif
@@
-1189,7
+1192,7
@@
uschar *system_filter_reply_transport = NULL;
gid_t system_filter_gid = 0;
BOOL system_filter_gid_set = FALSE;
gid_t system_filter_gid = 0;
BOOL system_filter_gid_set = FALSE;
-uid_t system_filter_uid =
0
;
+uid_t system_filter_uid =
(uid_t)-1
;
BOOL system_filter_uid_set = FALSE;
BOOL system_filtering = FALSE;
BOOL system_filter_uid_set = FALSE;
BOOL system_filtering = FALSE;
@@
-1268,6
+1271,7
@@
tree_node *tree_nonrecipients = NULL;
tree_node *tree_unusable = NULL;
BOOL trusted_caller = FALSE;
tree_node *tree_unusable = NULL;
BOOL trusted_caller = FALSE;
+BOOL trusted_config = TRUE;
gid_t *trusted_groups = NULL;
uid_t *trusted_users = NULL;
uschar *timezone_string = US TIMEZONE_DEFAULT;
gid_t *trusted_groups = NULL;
uid_t *trusted_users = NULL;
uschar *timezone_string = US TIMEZONE_DEFAULT;