# HG changeset patch
# User meillo@marmaro.de
# Date 1276963651 -7200
# Node ID 085d6cd444628331e69d76443fe0fcad15b6a1d3
# Parent  83a182793503ab42833238287df981837ded673d
using is_privileged_user() to check here too

diff -r 83a182793503 -r 085d6cd44462 src/masqmail.c
--- a/src/masqmail.c	Sat Jun 19 12:35:08 2010 +0200
+++ b/src/masqmail.c	Sat Jun 19 18:07:31 2010 +0200
@@ -258,13 +258,9 @@
 	message *msg = create_message();
 	gint i;
 
-	if (return_path != NULL) {
-		if ((conf.orig_uid != 0)
-		    && (conf.orig_uid != conf.mail_uid)
-		    && (!is_ingroup(conf.orig_uid, conf.mail_gid))) {
-			fprintf(stderr, "must be in root, %s or in group %s for setting return path.\n", DEF_MAIL_USER, DEF_MAIL_GROUP);
-			exit(EXIT_FAILURE);
-		}
+	if (return_path && !is_privileged_user(conf.orig_uid)) {
+		fprintf(stderr, "must be in root, %s or in group %s for setting return path.\n", DEF_MAIL_USER, DEF_MAIL_GROUP);
+		exit(EXIT_FAILURE);
 	}
 
 	if (!conf.run_as_user) {