diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2014-01-26 20:46:55 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2014-01-26 20:46:55 +0000 |
| commit | c1bfccf73ee6551521d508e89408309544c871c8 (patch) | |
| tree | c7649ff2b7ea8545ce9a302a23d0db6931877c1f /src/sendmail.h | |
| parent | e388eedd7a4356992c2ecf5dcc8e77368cd9c391 (diff) | |
Notes
Diffstat (limited to 'src/sendmail.h')
| -rw-r--r-- | src/sendmail.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/sendmail.h b/src/sendmail.h index 7487b6830dae..613d01ed8f48 100644 --- a/src/sendmail.h +++ b/src/sendmail.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2013 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2013 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -52,7 +52,7 @@ #ifdef _DEFINE # ifndef lint -SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1101 2013/03/15 17:54:12 ca Exp $"; +SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1104 2013/11/22 20:51:56 ca Exp $"; # endif /* ! lint */ #endif /* _DEFINE */ @@ -137,10 +137,15 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1101 2013/03/15 17:5 # if SASL == 2 || SASL >= 20000 # include <sasl/sasl.h> +# include <sasl/saslplug.h> # include <sasl/saslutil.h> +# if SASL_VERSION_FULL < 0x020119 +typedef int (*sasl_callback_ft)(void); +# endif /* SASL_VERSION_FULL < 0x020119 */ # else /* SASL == 2 || SASL >= 20000 */ # include <sasl.h> # include <saslutil.h> +typedef int (*sasl_callback_ft)(void); # endif /* SASL == 2 || SASL >= 20000 */ # if defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) && defined(SASL_VERSION_STEP) # define SASL_VERSION (SASL_VERSION_MAJOR * 10000) + (SASL_VERSION_MINOR * 100) + SASL_VERSION_STEP @@ -478,6 +483,7 @@ struct mailer #define M_HOLD '%' /* Hold delivery until ETRN/-qI/-qR/-qS */ #define M_PLUS '+' /* Reserved: Used in mc for adding new flags */ #define M_MINUS '-' /* Reserved: Used in mc for removing flags */ +#define M_NOMHHACK '!' /* Don't perform HM hack dropping explicit from */ /* functions */ extern void initerrmailers __P((void)); @@ -1841,7 +1847,7 @@ extern void setup_daemon_milters __P((void)); #define VENDOR_SUN 2 /* Sun-native configuration file */ #define VENDOR_HP 3 /* Hewlett-Packard specific config syntax */ #define VENDOR_IBM 4 /* IBM specific config syntax */ -#define VENDOR_SENDMAIL 5 /* Sendmail, Inc. specific config syntax */ +#define VENDOR_SENDMAIL 5 /* Proofpoint, Inc. specific config syntax */ #define VENDOR_DEC 6 /* Compaq, DEC, Digital */ /* prototypes for vendor-specific hook routines */ |