Sendmail 8.6.10 update for security problems.

Imported on CSRG/V_8_6_10 branch.

Obtained from: CSRG/Allman

1 files changed, 14 insertions, 8 deletions

diff --git a/usr.sbin/sendmail/src/mci.c b/usr.sbin/sendmail/src/mci.c
index 8160b83..8211a62 100644
--- a/usr.sbin/sendmail/src/mci.c
+++ b/usr.sbin/sendmail/src/mci.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)mci.c	8.13 (Berkeley) 4/12/94";
+static char sccsid[] = "@(#)mci.c	8.14 (Berkeley) 5/15/94";
 #endif /* not lint */
 
 #include "sendmail.h"
@@ -83,18 +83,17 @@ mci_cache(mci)
 	register MCI **mcislot;
 	extern MCI **mci_scan();
 
-	if (MaxMciCache <= 0)
-	{
-		/* we don't support caching */
-		return;
-	}
-
 	/*
 	**  Find the best slot.  This may cause expired connections
 	**  to be closed.
 	*/
 
 	mcislot = mci_scan(mci);
+	if (mcislot == NULL)
+	{
+		/* we don't support caching */
+		return;
+	}
 
 	/* if this is already cached, we are done */
 	if (bitset(MCIF_CACHED, mci->mci_flags))
@@ -136,6 +135,12 @@ mci_scan(savemci)
 	register MCI *mci;
 	register int i;
 
+	if (MaxMciCache <= 0)
+	{
+		/* we don't support caching */
+		return NULL;
+	}
+
 	if (MciCache == NULL)
 	{
 		/* first call */
@@ -267,6 +272,7 @@ mci_get(host, m)
 {
 	register MCI *mci;
 	register STAB *s;
+	extern MCI **mci_scan();
 
 #ifdef DAEMON
 	extern SOCKADDR CurHostAddr;
@@ -276,7 +282,7 @@ mci_get(host, m)
 #endif
 
 	/* clear out any expired connections */
-	mci_scan(NULL);
+	(void) mci_scan(NULL);
 
 	if (m->m_mno < 0)
 		syserr("negative mno %d (%s)", m->m_mno, m->m_name);