dovecot-2.0: lda: Don't fail with "mail_uid/mail_gid not set" er...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/14190cceb903
changeset: 12042:14190cceb903
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Aug 24 17:18:01 2010 +0100
description:
lda: Don't fail with "mail_uid/mail_gid not set" error when running without -u.

diffstat:

 src/lib-storage/mail-storage-service.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 6933cfa5315a -r 14190cceb903 src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c	Tue Aug 24 17:01:27 2010 +0100
+++ b/src/lib-storage/mail-storage-service.c	Tue Aug 24 17:18:01 2010 +0100
@@ -317,7 +317,8 @@
 				dec2str(rset.uid));
 			return -1;
 		}
-	} else if (rset.uid == (uid_t)-1 && disallow_root) {
+	} else if (rset.uid == (uid_t)-1 &&
+		   disallow_root && current_euid == 0) {
 		*error_r = "User is missing UID (see mail_uid setting)";
 		return -1;
 	}
@@ -336,7 +337,8 @@
 				dec2str(rset.gid));
 			return -1;
 		}
-	} else if (rset.gid == (gid_t)-1 && disallow_root) {
+	} else if (rset.gid == (gid_t)-1 && disallow_root &&
+		   set->first_valid_gid > 0 && getegid() == 0) {
 		*error_r = "User is missing GID (see mail_gid setting)";
 		return -1;
 	}