From: Timo Sirainen <tss@iki.fi>
Date: Sun, 14 Mar 2010 13:27:23 +0000 (+0200)
Subject: master: Allow unix_listeners to also have user=$default_*_user
X-Git-Tag: 2.0.beta4~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5dcb4410183f4a83bd94444e5e6e67a76d5d544;p=thirdparty%2Fdovecot%2Fcore.git

master: Allow unix_listeners to also have user=$default_*_user

--HG--
branch : HEAD
---

diff --git a/src/master/service.c b/src/master/service.c
index 73720d2ad8..f9da62b958 100644
--- a/src/master/service.c
+++ b/src/master/service.c
@@ -31,6 +31,20 @@ void service_error(struct service *service, const char *format, ...)
 	va_end(args);
 }
 
+static int
+get_uidgid_expanded(const char *user, const struct master_settings *set,
+		    uid_t *uid_r, gid_t *gid_r, const char **error_r)
+{
+	/* $variable expansion is typically done by doveconf, but these
+	   variables can come from built-in settings, so we need to expand
+	   them here */
+	if (strcmp(user, "$default_internal_user") == 0)
+		user = set->default_internal_user;
+	else if (strcmp(user, "$default_login_user") == 0)
+		user = set->default_login_user;
+	return get_uidgid(user, uid_r, gid_r, error_r);
+}
+
 static struct service_listener *
 service_create_file_listener(struct service *service,
 			     enum service_listener_type type,
@@ -46,7 +60,8 @@ service_create_file_listener(struct service *service,
 	l->fd = -1;
 	l->set.fileset.set = set;
 
-	if (get_uidgid(set->user, &l->set.fileset.uid, &gid, error_r) < 0)
+	if (get_uidgid_expanded(set->user, service->set->master_set,
+				&l->set.fileset.uid, &gid, error_r) < 0)
 		return NULL;
 	if (get_gid(set->group, &l->set.fileset.gid, error_r) < 0)
 		return NULL;
@@ -166,7 +181,7 @@ service_create(pool_t pool, const struct service_settings *set,
 	struct inet_listener_settings *const *inet_listeners;
 	struct service *service;
         struct service_listener *l;
-	const char *user, *const *tmp;
+	const char *const *tmp;
 	string_t *str;
 	unsigned int i, unix_count, fifo_count, inet_count;
 
@@ -200,17 +215,9 @@ service_create(pool_t pool, const struct service_settings *set,
 		return NULL;
 	}
 
-	/* $variable expansion is typically done by doveconf, but these
-	   variables can come from built-in settings, so we need to expand
-	   them here */
-	user = set->user;
-	if (strcmp(user, "$default_internal_user") == 0)
-		user = set->master_set->default_internal_user;
-	else if (strcmp(user, "$default_login_user") == 0)
-		user = set->master_set->default_login_user;
-
 	/* default gid to user's primary group */
-	if (get_uidgid(user, &service->uid, &service->gid, error_r) < 0)
+	if (get_uidgid_expanded(set->user, set->master_set, &service->uid,
+				&service->gid, error_r) < 0)
 		return NULL;
 	if (*set->group != '\0') {
 		if (get_gid(set->group, &service->gid, error_r) < 0)