X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fmacros.h;h=0f93543ce7156ca19fe7f3061520ac927eb7082d;hb=9d727701a16bf4a93b136fe01e1bf2e5996c96ee;hp=2e4f6c45c48c36616bb94dc55d0b2e6bcbcd2277;hpb=c2a1bba0d1fe5e19f93c92544422036814695c45;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/macros.h b/src/src/macros.h index 2e4f6c45c..0f93543ce 100644 --- a/src/src/macros.h +++ b/src/src/macros.h @@ -563,6 +563,8 @@ table exim_errstrings[] in log.c */ #define ERRNO_RETRY_BASE (-51) /* Base to test against */ #define ERRNO_RRETRY (-51) /* Not time for routing */ + +#define ERRNO_WARN_BASE (-52) /* Base to test against */ #define ERRNO_LRETRY (-52) /* Not time for local delivery */ #define ERRNO_HRETRY (-53) /* Not time for any remote host */ #define ERRNO_LOCAL_ONLY (-54) /* Local-only delivery */ @@ -1014,15 +1016,16 @@ enum { FILTER_UNSET, FILTER_FORWARD, FILTER_EXIM, FILTER_SIEVE }; /* Codes for ESMTP facilities offered by peer */ -#define OPTION_TLS BIT(0) -#define OPTION_IGNQ BIT(1) -#define OPTION_PRDR BIT(2) -#define OPTION_UTF8 BIT(3) -#define OPTION_DSN BIT(4) -#define OPTION_PIPE BIT(5) -#define OPTION_SIZE BIT(6) -#define OPTION_CHUNKING BIT(7) -#define OPTION_REQUIRETLS BIT(8) +#define OPTION_TLS BIT(0) +#define OPTION_IGNQ BIT(1) +#define OPTION_PRDR BIT(2) +#define OPTION_UTF8 BIT(3) +#define OPTION_DSN BIT(4) +#define OPTION_PIPE BIT(5) +#define OPTION_SIZE BIT(6) +#define OPTION_CHUNKING BIT(7) +#define OPTION_REQUIRETLS BIT(8) +#define OPTION_EARLY_PIPE BIT(9) /* Codes for tls_requiretls requests (usually by sender) */ @@ -1057,10 +1060,16 @@ should not be one active. */ # define ALARM(seconds) \ debug_selector & D_any \ - ? (sigalarm_setter = CCS __FUNCTION__, alarm(seconds)) : alarm(seconds); + ? (sigalarm_setter = CUS __FUNCTION__, alarm(seconds)) : alarm(seconds); # define ALARM_CLR(seconds) \ debug_selector & D_any \ ? (sigalarm_setter = NULL, alarm(seconds)) : alarm(seconds); #endif +#define AUTHS_REGEX US"\\n250[\\s\\-]AUTH\\s+([\\-\\w \\t]+)(?:\\n|$)" + +#define EARLY_PIPE_FEATURE_NAME "X_PIPE_CONNECT" +#define EARLY_PIPE_FEATURE_LEN 14 + + /* End of macros.h */