# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1256663491 14400
# Node ID ead94beba32a4d7ee192fb39a954bbc92fe74bb4
# Parent  abbb153d4643c1fcd6d750c156c0c14846482cb4
deliver: Fixed binary setuid-checking.

diff -r abbb153d4643 -r ead94beba32a src/deliver/deliver.c
--- a/src/deliver/deliver.c	Tue Oct 27 00:21:53 2009 -0400
+++ b/src/deliver/deliver.c	Tue Oct 27 13:11:31 2009 -0400
@@ -920,7 +920,7 @@
 			fprintf(stderr, "stat(%s) failed: %s\n",
 				argv[0], strerror(errno));
 			return EX_TEMPFAIL;
-		} else if ((st.st_mode & 1) != 0) {
+		} else if ((st.st_mode & 1) != 0 && (st.st_mode & 04000) != 0) {
 			fprintf(stderr, "%s must not be both world-executable "
 				"and setuid-root. This allows root exploits. "
 				"See http://wiki.dovecot.org/LDA#multipleuids\n",