diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2007-04-09 01:44:16 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2007-04-09 01:44:16 +0000 |
commit | 84a4aaabc654a5912f1d321b0ef7a20746f4c371 (patch) | |
tree | ee9c26407a2442d1c45fb8592df563df0e5a520d /contrib/sendmail/src/conf.h | |
parent | 97853bac963c5d3bed1b2cc8456b52dc100a3a16 (diff) | |
download | FreeBSD-src-84a4aaabc654a5912f1d321b0ef7a20746f4c371.zip FreeBSD-src-84a4aaabc654a5912f1d321b0ef7a20746f4c371.tar.gz |
Resolve conflicts from sendmail 8.14.1 import
Diffstat (limited to 'contrib/sendmail/src/conf.h')
-rw-r--r-- | contrib/sendmail/src/conf.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index ab23bca..99ed47d 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 8.570 2005/12/09 18:37:27 ca Exp $ + * $Id: conf.h,v 8.574 2006/11/29 00:36:06 ca Exp $ * * $FreeBSD$ * @@ -63,6 +63,11 @@ struct rusage; /* forward declaration to get gcc to shut up in wait.h */ **********************************************************************/ #define MAXLINE 2048 /* max line length */ +#if SASL +# define MAXINPLINE 12288 /* max input line length (for AUTH) */ +#else /* SASL */ +# define MAXINPLINE MAXLINE /* max input line length */ +#endif /* SASL */ #define MAXNAME 256 /* max length of a name */ #ifndef MAXAUTHINFO # define MAXAUTHINFO 100 /* max length of authinfo token */ @@ -74,11 +79,7 @@ struct rusage; /* forward declaration to get gcc to shut up in wait.h */ #define MAXMXHOSTS 100 /* max # of MX records for one host */ #define SMTPLINELIM 990 /* max SMTP line length */ #define MAXUDBKEY 128 /* max size of a database key (udb only) */ -#if _FFR_MAXKEY -# define MAXKEY 1024 /* max size of a database key */ -#else /* _FFR_MAXKEY */ -# define MAXKEY (MAXNAME + 1) /* max size of a database key */ -#endif /* _FFR_MAXKEY */ +#define MAXKEY 1024 /* max size of a database key */ #define MEMCHUNKSIZE 1024 /* chunk size for memory allocation */ #define MAXUSERENVIRON 100 /* max envars saved, must be >= 3 */ #define MAXMAPSTACK 12 /* max # of stacked or sequenced maps */ |