dovecot-2.0-sslstream: master: unix_listener's user/group wasn't...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/ce18bbd3e964
changeset: 10371:ce18bbd3e964
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Nov 18 23:13:08 2009 -0500
description:
master: unix_listener's user/group wasn't being used.

diffstat:

1 file changed, 7 insertions(+), 5 deletions(-)
src/master/service-listen.c |   12 +++++++-----

diffs (23 lines):

diff -r 6aa11c638f54 -r ce18bbd3e964 src/master/service-listen.c
--- a/src/master/service-listen.c	Wed Nov 18 20:43:44 2009 -0500
+++ b/src/master/service-listen.c	Wed Nov 18 23:13:08 2009 -0500
@@ -59,12 +59,14 @@ static int service_unix_listener_listen(
 	i_assert(fd != -1);
 
 	/* see if we need to change its owner/group */
-	if ((service->uid != (uid_t)-1 && service->uid != master_uid) ||
-	    (service->gid != (gid_t)-1 && service->gid != master_gid)) {
-		if (chown(set->path, service->uid, service->gid) < 0) {
+	if ((l->set.fileset.uid != (uid_t)-1 &&
+	     l->set.fileset.uid != master_uid) ||
+	    (l->set.fileset.gid != (gid_t)-1 &&
+	     l->set.fileset.gid != master_gid)) {
+		if (chown(set->path, l->set.fileset.uid, l->set.fileset.gid) < 0) {
 			i_error("chown(%s, %lld, %lld) failed: %m", set->path,
-				(long long)service->uid,
-				(long long)service->gid);
+				(long long)l->set.fileset.uid,
+				(long long)l->set.fileset.gid);
 			(void)close(fd);
 			return -1;
 		}