summaryrefslogtreecommitdiff
path: root/usr.sbin/sendmail/src/main.c
diff options
context:
space:
mode:
authorglass <glass@NetBSD.org>1994-03-16 02:11:31 +0000
committerglass <glass@NetBSD.org>1994-03-16 02:11:31 +0000
commit3fb497653d34cde8706b0e446e52182df5bc4ae7 (patch)
tree378207336652cf6132b6412b0e6c3f105621d985 /usr.sbin/sendmail/src/main.c
parentc0ae496079e5f8f6af13afb704a68b285f4d14b4 (diff)
sendmail 8.6.7. fixes recently discovered security hole
Diffstat (limited to 'usr.sbin/sendmail/src/main.c')
-rw-r--r--usr.sbin/sendmail/src/main.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/usr.sbin/sendmail/src/main.c b/usr.sbin/sendmail/src/main.c
index d05f13da46c..cdd97c34a9a 100644
--- a/usr.sbin/sendmail/src/main.c
+++ b/usr.sbin/sendmail/src/main.c
@@ -39,14 +39,13 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)main.c 8.46 (Berkeley) 1/9/94";
+static char sccsid[] = "@(#)main.c 8.52 (Berkeley) 3/11/94";
#endif /* not lint */
#define _DEFINE
#include "sendmail.h"
-#include <sgtty.h>
-#ifdef NAMED_BIND
+#if NAMED_BIND
#include <arpa/nameser.h>
#include <resolv.h>
#endif
@@ -321,7 +320,7 @@ main(argc, argv, envp)
OpMode = MD_DELIVER;
FullName = getenv("NAME");
-#ifdef NAMED_BIND
+#if NAMED_BIND
if (tTd(8, 8))
_res.options |= RES_DEBUG;
#endif
@@ -443,6 +442,9 @@ main(argc, argv, envp)
case MD_TEST:
case MD_INITALIAS:
case MD_PRINT:
+#ifdef MAYBE_NEXT_RELEASE
+ case MD_ARPAFTP:
+#endif
OpMode = j;
break;
@@ -708,13 +710,6 @@ main(argc, argv, envp)
/* remove things that don't make sense in daemon mode */
FullName = NULL;
break;
-
- case MD_SMTP:
- if (RealUid != 0)
- auth_warning(CurEnv,
- "%s owned process doing -bs",
- RealUserName);
- break;
}
/* do heuristic mode adjustment */
@@ -1297,6 +1292,7 @@ disconnect(droplev, e)
HoldErrs = TRUE;
CurEnv->e_errormode = EM_MAIL;
Verbose = FALSE;
+ DisConnected = TRUE;
/* all input from /dev/null */
if (InChannel != stdin)
@@ -1360,7 +1356,7 @@ obsolete(argv)
/* skip over options that do have a value */
op = strchr(OPTIONS, ap[1]);
if (op != NULL && *++op == ':' && ap[2] == '\0' &&
- argv[1] != NULL && argv[1][0] != '-')
+ ap[1] != 'd' && argv[1] != NULL && argv[1][0] != '-')
{
argv++;
continue;