From: Timo Sirainen <tss@iki.fi>
Date: Fri, 20 Aug 2010 18:49:42 +0000 (+0100)
Subject: lib-storage: Don't complain about missing UID/GID when running as root is allowed... 
X-Git-Tag: 2.0.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13295d1c3b0062b932ad0b62d3320361f5cfda6e;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Don't complain about missing UID/GID when running as root is allowed (standalone).
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 92282004aa..fd34b7d2d6 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -317,7 +317,7 @@ service_drop_privileges(const struct mail_user_settings *set,
 				dec2str(rset.uid));
 			return -1;
 		}
-	} else if (rset.uid == (uid_t)-1) {
+	} else if (rset.uid == (uid_t)-1 && disallow_root) {
 		*error_r = "User is missing UID (see mail_uid setting)";
 		return -1;
 	}
@@ -336,7 +336,7 @@ service_drop_privileges(const struct mail_user_settings *set,
 				dec2str(rset.gid));
 			return -1;
 		}
-	} else if (rset.gid == (gid_t)-1) {
+	} else if (rset.gid == (gid_t)-1 && disallow_root) {
 		*error_r = "User is missing GID (see mail_gid setting)";
 		return -1;
 	}