Imported Debian patch 8.9.3-23debian/8.9.3-23

2 files changed, 1 insertions, 13 deletions

diff --git a/src/main.c b/src/main.c
index d1c7186..cea9d15 100644
--- a/src/main.c
+++ b/src/main.c
@@ -984,18 +984,6 @@ main(argc, argv, envp)
 		usrerr("Permission denied");
 		finis(FALSE, EX_USAGE);
 	}
-	if (OpMode == MD_INITALIAS &&
-			RealUid != 0 &&
-			RealUid != TrustedUid &&
-			!wordinclass(RealUserName, 't'))
-	{
-		if (LogLevel > 1)
-			sm_syslog(LOG_ALERT, NOQID,
-					"user %d attempted to rebuild the alias map",
-					RealUid);
-		usrerr("Permission denied");
-		finis(FALSE, EX_USAGE);
-	}
 
 	if (MeToo)
 		BlankEnvelope.e_flags |= EF_METOO;
diff --git a/src/mime.c b/src/mime.c
index 7156891..aea8f7e 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -443,7 +443,7 @@ mime8to7(mci, header, e, boundaries, flags)
 	{
 		/* no encoding necessary */
 		if (cte != NULL &&
-		    bitset(MCIF_INMIME, mci->mci_flags) &&
+	    bitset(MCIF_INMIME, mci->mci_flags) &&
 		    !bitset(M87F_NO8TO7, flags))
 		{
 			/*