X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/59cf854452de4339f1560ca82e927f7fdaa55b7f..45b915963e2e3721fc65c7c3f50f2f65f5c54d1b:/src/src/macros.h diff --git a/src/src/macros.h b/src/src/macros.h index 9290c0f32..59c05e697 100644 --- a/src/src/macros.h +++ b/src/src/macros.h @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/macros.h,v 1.15 2005/06/27 10:21:38 ph10 Exp $ */ +/* $Cambridge: exim/src/src/macros.h,v 1.26 2006/06/28 16:00:24 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2006 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -160,11 +160,6 @@ record. */ #define WAIT_NAME_MAX 50 -/* The numbers of connection and message variables for ACLs */ - -#define ACL_C_MAX 10 -#define ACL_M_MAX 10 - /* Fixed option values for all PCRE functions */ #define PCRE_COPT 0 /* compile */ @@ -318,7 +313,13 @@ for having to swallow the rest of an SMTP message is whether the value is #define D_uid 0x20000000 #define D_verify 0x40000000 -#define D_all (0xffffffff & ~D_memory) +/* The D_all value must always have all bits set, as it is recognized specially +by the function that decodes debug and log selectors. This is to enable it to +set all the bits in a multi-word selector. Debug doesn't use this yet, but we +are getting close. In fact, we want to omit "memory" for -d+all, but can't +handle this here. It is fudged externally. */ + +#define D_all 0xffffffff #define D_any (D_all & \ ~(D_v | \ @@ -342,6 +343,10 @@ values > 0x80000000 and are put into log_extra_selector (without the top bit). These are only ever tested independently. "All" is a magic value that is used only in the name table to set all options in both bit maps. */ +/* The L_all value must always have all bits set, as it is recognized specially +by the function that decodes debug and log selectors. This is to enable it to +set all the bits in a multi-word selector. */ + #define L_all 0xffffffff #define L_address_rewrite 0x00000001 @@ -361,25 +366,28 @@ only in the name table to set all options in both bit maps. */ #define L_smtp_protocol_error 0x00004000 #define L_smtp_syntax_error 0x00008000 -#define LX_arguments 0x80000001 -#define LX_deliver_time 0x80000002 -#define LX_delivery_size 0x80000004 -#define LX_ident_timeout 0x80000008 -#define LX_incoming_interface 0x80000010 -#define LX_incoming_port 0x80000020 -#define LX_outgoing_port 0x80000040 -#define LX_queue_time 0x80000080 -#define LX_queue_time_overall 0x80000100 -#define LX_received_sender 0x80000200 -#define LX_received_recipients 0x80000400 -#define LX_rejected_header 0x80000800 -#define LX_return_path_on_delivery 0x80001000 -#define LX_sender_on_delivery 0x80002000 -#define LX_smtp_confirmation 0x80004000 -#define LX_subject 0x80008000 -#define LX_tls_certificate_verified 0x80010000 -#define LX_tls_cipher 0x80020000 -#define LX_tls_peerdn 0x80040000 +#define LX_acl_warn_skipped 0x80000001 +#define LX_arguments 0x80000002 +#define LX_deliver_time 0x80000004 +#define LX_delivery_size 0x80000008 +#define LX_ident_timeout 0x80000010 +#define LX_incoming_interface 0x80000020 +#define LX_incoming_port 0x80000040 +#define LX_outgoing_port 0x80000080 +#define LX_queue_time 0x80000100 +#define LX_queue_time_overall 0x80000200 +#define LX_received_sender 0x80000400 +#define LX_received_recipients 0x80000800 +#define LX_rejected_header 0x80001000 +#define LX_return_path_on_delivery 0x80002000 +#define LX_sender_on_delivery 0x80004000 +#define LX_sender_verify_fail 0x80008000 +#define LX_smtp_confirmation 0x80010000 +#define LX_subject 0x80020000 +#define LX_tls_certificate_verified 0x80040000 +#define LX_tls_cipher 0x80080000 +#define LX_tls_peerdn 0x80100000 +#define LX_unknown_in_list 0x80200000 #define L_default (L_connection_reject | \ L_delay_delivery | \ @@ -392,7 +400,9 @@ only in the name table to set all options in both bit maps. */ L_size_reject | \ L_skip_delivery) -#define LX_default ((LX_rejected_header | \ +#define LX_default ((LX_acl_warn_skipped | \ + LX_rejected_header | \ + LX_sender_verify_fail | \ LX_tls_cipher) & 0x7fffffff) /* Private error numbers for delivery failures, set negative so as not @@ -442,6 +452,8 @@ to conflict with system errno values. */ #define ERRNO_AUTHFAIL (-42) /* When required by client */ #define ERRNO_CONNECTTIMEOUT (-43) /* Used internally in smtp transport */ #define ERRNO_RCPT4XX (-44) /* RCPT gave 4xx error */ +#define ERRNO_MAIL4XX (-45) /* MAIL gave 4xx error */ +#define ERRNO_DATA4XX (-46) /* DATA gave 4xx error */ /* These must be last, so all retry deferments can easily be identified */ @@ -496,6 +508,7 @@ router, which were chosen to represent the standard situation for users' #define RDO_REWRITE 0x00020000 /* Rewrite generated addresses */ #define RDO_EXIM_FILTER 0x00040000 /* Forbid Exim filters */ #define RDO_SIEVE_FILTER 0x00080000 /* Forbid Sieve filters */ +#define RDO_PREPEND_HOME 0x00100000 /* Prepend $home to relative paths in Exim filter save commands */ /* This is the set that apply to expansions in filters */ @@ -509,7 +522,7 @@ automated, but I haven't bothered. Keep this list in step with the above! */ enum { RDON_BLACKHOLE, RDON_DEFER, RDON_EACCES, RDON_ENOTDIR, RDON_EXISTS, RDON_FAIL, RDON_FILTER, RDON_FREEZE, RDON_INCLUDE, RDON_LOG, RDON_LOOKUP, RDON_PERL, RDON_READFILE, RDON_READSOCK, RDON_RUN, RDON_DLFUNC, RDON_REALLOG, - RDON_REWRITE, RDON_EXIM_FILTER, RDON_SIEVE_FILTER }; + RDON_REWRITE, RDON_EXIM_FILTER, RDON_SIEVE_FILTER, RDON_PREPEND_HOME }; /* Results of filter or forward file processing. Some are only from a filter; some are only from a forward file. */ @@ -607,6 +620,7 @@ enum { v_none, v_sender, v_recipient, v_expn }; #define vopt_callout_no_cache 0x0040 /* disable callout cache */ #define vopt_callout_recipsender 0x0080 /* use real sender to verify recip */ #define vopt_callout_recippmaster 0x0100 /* use postmaster to verify recip */ +#define vopt_success_on_redirect 0x0200 /* Values for fields in callout cache records */ @@ -618,6 +632,7 @@ enum { v_none, v_sender, v_recipient, v_expn }; #define lookup_querystyle 1 /* query-style lookup */ #define lookup_absfile 2 /* requires absolute file name */ +#define lookup_absfilequery 4 /* query-style starts with file name */ /* Status values for host_item blocks. Require hstatus_unusable and hstatus_unusable_expired to be last. */ @@ -763,6 +778,7 @@ enum { ACL_WHERE_RCPT, /* Some controls are for RCPT only */ ACL_WHERE_EXPN, ACL_WHERE_HELO, ACL_WHERE_MAILAUTH, + ACL_WHERE_NOTSMTP_START, ACL_WHERE_QUIT, ACL_WHERE_STARTTLS, ACL_WHERE_VRFY