X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2dc40d89a2b1dbde4a318ca9ef77cbcdce600e9c..dc6d17694a767a23c5560835303be32a4238b7b3:/src/src/local_scan.h diff --git a/src/src/local_scan.h b/src/src/local_scan.h index 25b194407..c974ac6e7 100644 --- a/src/src/local_scan.h +++ b/src/src/local_scan.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ /* This file is the header that is the only Exim header to be included in the @@ -98,8 +98,8 @@ ABI is changed in a non backward compatible way. The minor number is increased each time a new feature is added (in a way that doesn't break backward compatibility). */ -#define LOCAL_SCAN_ABI_VERSION_MAJOR 1 -#define LOCAL_SCAN_ABI_VERSION_MINOR 1 +#define LOCAL_SCAN_ABI_VERSION_MAJOR 2 +#define LOCAL_SCAN_ABI_VERSION_MINOR 0 #define LOCAL_SCAN_ABI_VERSION \ LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR @@ -115,7 +115,7 @@ typedef struct header_line { /* Entries in lists options are in this form. */ typedef struct { - const char *name; + const char *name; /* should have been uschar but too late now */ int type; void *value; } optionlist; @@ -128,6 +128,8 @@ typedef struct recipient_item { uschar *address; /* the recipient address */ int pno; /* parent number for "one_time" alias, or -1 */ uschar *errors_to; /* the errors_to address or NULL */ + uschar *orcpt; /* DSN orcpt */ + int dsn_flags; /* DSN flags */ #ifdef EXPERIMENTAL_BRIGHTMAIL uschar *bmi_optin; #endif @@ -184,10 +186,10 @@ extern void receive_add_recipient(uschar *, int); extern BOOL receive_remove_recipient(uschar *); extern uschar *rfc2047_decode(uschar *, BOOL, uschar *, int, int *, uschar **); extern int smtp_fflush(void); -extern void smtp_printf(const char *, ...) PRINTF_FUNCTION(1,2); -extern void smtp_vprintf(const char *, va_list); -extern uschar *string_copy(uschar *); -extern uschar *string_copyn(uschar *, int); -extern uschar *string_sprintf(const char *, ...) PRINTF_FUNCTION(1,2); +extern void smtp_printf(const char *, BOOL, ...) PRINTF_FUNCTION(1,3); +extern void smtp_vprintf(const char *, BOOL, va_list); +extern uschar *string_copy(const uschar *); +extern uschar *string_copyn(const uschar *, int); +extern uschar *string_sprintf(const char *, ...) ALMOST_PRINTF(1,2); /* End of local_scan.h */