From 8583ab396a4fbaa6aa61474aac7572eea7e147f8 Mon Sep 17 00:00:00 2001 From: Eric Allman Date: Thu, 17 Dec 1992 00:41:24 -0800 Subject: [PATCH] tweak some of the configurations to up some values SCCS-vsn: usr.sbin/sendmail/src/conf.c 5.47 SCCS-vsn: usr.sbin/sendmail/src/conf.h 5.32 --- usr/src/usr.sbin/sendmail/src/conf.c | 6 +++--- usr/src/usr.sbin/sendmail/src/conf.h | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c index fc8e08d645..46779a5e49 100644 --- a/usr/src/usr.sbin/sendmail/src/conf.c +++ b/usr/src/usr.sbin/sendmail/src/conf.c @@ -7,7 +7,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)conf.c 5.46 (Berkeley) %G%"; +static char sccsid[] = "@(#)conf.c 5.47 (Berkeley) %G%"; #endif /* not lint */ # include @@ -138,11 +138,11 @@ setdefaults() WkRecipFact = 1000; WkClassFact = 1800; WkTimeFact = 9000; - FileMode = 0644; + FileMode = (getuid() != geteuid()) ? 0644 : 0600; DefUid = 1; DefGid = 1; CheckpointInterval = 10; - MaxHopCount = MAXHOP; + MaxHopCount = 17; SendMode = SM_FORK; ErrorMode = EM_PRINT; EightBit = FALSE; diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h index e30638a4a0..bfd029e376 100644 --- a/usr/src/usr.sbin/sendmail/src/conf.h +++ b/usr/src/usr.sbin/sendmail/src/conf.h @@ -5,7 +5,7 @@ * * %sccs.include.redist.c% * - * @(#)conf.h 5.31 (Berkeley) %G% + * @(#)conf.h 5.32 (Berkeley) %G% */ /* @@ -20,16 +20,19 @@ # define MAXLINE 1024 /* max line length */ # define MAXNAME 256 /* max length of a name */ # define MAXPV 40 /* max # of parms to mailers */ -# define MAXHOP 17 /* max value of HopCount */ # define MAXATOM 100 /* max atoms per address */ # define MAXMAILERS 25 /* maximum mailers known to system */ -# define MAXRWSETS 30 /* max # of sets of rewriting rules */ +# define MAXRWSETS 100 /* max # of sets of rewriting rules */ # define MAXPRIORITIES 25 /* max values for Precedence: field */ # define MAXTRUST 30 /* maximum number of trusted users */ # define MAXUSERENVIRON 40 /* max # of items in user environ */ -# define QUEUESIZE 600 /* max # of jobs per queue run */ -# define MAXMXHOSTS 10 /* max # of MX records */ +# define MAXMXHOSTS 20 /* max # of MX records */ # define SMTPLINELIM 990 /* maximum SMTP line length */ + +# ifndef QUEUESIZE +# define QUEUESIZE 1000 /* max # of jobs per queue run */ +# endif + # ifndef FORK # define FORK vfork /* function to call to fork mailer */ # endif @@ -52,7 +55,7 @@ # ifdef NEWDB # define USERDB 1 /* look in user database (requires NEWDB) */ # define BTREE_MAP 1 /* enable BTREE mapping type (requires NEWDB) */ -/*# define HASH_MAP 1 /* enable HASH mapping type (requires NEWDB) */ +# define HASH_MAP 1 /* enable HASH mapping type (requires NEWDB) */ # endif # ifdef NDBM -- 2.20.1