From: Timo Sirainen <tss@iki.fi>
Date: Thu, 8 Dec 2011 03:02:15 +0000 (+0200)
Subject: director: Don't explicitly use base_dir. We're already chdired there, use relative... 
X-Git-Tag: 2.1.rc2~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb35b9f2c80954da842c20d5128b5e506835d93e;p=thirdparty%2Fdovecot%2Fcore.git

director: Don't explicitly use base_dir. We're already chdired there, use relative paths.
---

diff --git a/src/director/Makefile.am b/src/director/Makefile.am
index d9ca5aa4d1..11f4b32c00 100644
--- a/src/director/Makefile.am
+++ b/src/director/Makefile.am
@@ -7,8 +7,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-auth \
 	-I$(top_srcdir)/src/lib-imap \
 	-I$(top_srcdir)/src/lib-settings \
-	-I$(top_srcdir)/src/lib-master \
-	-DPKG_RUNDIR=\""$(rundir)"\"
+	-I$(top_srcdir)/src/lib-master
 
 director_LDADD = $(LIBDOVECOT)
 director_DEPENDENCIES = $(LIBDOVECOT_DEPS)
diff --git a/src/director/director-settings.c b/src/director/director-settings.c
index 4175df0b20..c39dc8dc13 100644
--- a/src/director/director-settings.c
+++ b/src/director/director-settings.c
@@ -64,7 +64,6 @@ struct service_settings director_service_settings = {
 	{ type, #name, offsetof(struct director_settings, name), NULL }
 
 static const struct setting_define director_setting_defines[] = {
-	DEF(SET_STR, base_dir),
 	DEF(SET_STR, master_user_separator),
 
 	DEF(SET_STR, director_servers),
@@ -76,7 +75,6 @@ static const struct setting_define director_setting_defines[] = {
 };
 
 const struct director_settings director_default_settings = {
-	.base_dir = PKG_RUNDIR,
 	.master_user_separator = "",
 
 	.director_servers = "",
diff --git a/src/director/director-settings.h b/src/director/director-settings.h
index 94f659eff6..502a38a6c1 100644
--- a/src/director/director-settings.h
+++ b/src/director/director-settings.h
@@ -2,7 +2,6 @@
 #define DIRECTOR_SETTINGS_H
 
 struct director_settings {
-	const char *base_dir;
 	const char *master_user_separator;
 
 	const char *director_servers;
diff --git a/src/director/director.c b/src/director/director.c
index 2834740c44..1a8177cce1 100644
--- a/src/director/director.c
+++ b/src/director/director.c
@@ -576,7 +576,6 @@ director_init(const struct director_settings *set,
 	      director_state_change_callback_t *callback)
 {
 	struct director *dir;
-	const char *path;
 
 	dir = i_new(struct director, 1);
 	dir->set = set;
@@ -588,8 +587,7 @@ director_init(const struct director_settings *set,
 	dir->users = user_directory_init(set->director_user_expire);
 	dir->mail_hosts = mail_hosts_init();
 
-	path = t_strconcat(set->base_dir, "/" DIRECTOR_IPC_PROXY_PATH, NULL);
-	dir->ipc_proxy = ipc_client_init(path);
+	dir->ipc_proxy = ipc_client_init(DIRECTOR_IPC_PROXY_PATH);
 	return dir;
 }
 
diff --git a/src/director/main.c b/src/director/main.c
index af7a3db866..3db1ef03d7 100644
--- a/src/director/main.c
+++ b/src/director/main.c
@@ -25,7 +25,6 @@
 
 static struct director *director;
 static struct notify_connection *notify_conn;
-static char *auth_socket_path, *userdb_socket_path;
 
 static int director_client_connected(int fd, const struct ip_addr *ip)
 {
@@ -93,7 +92,7 @@ static void client_connected(struct master_service_connection *conn)
 	   Both of them are handled exactly the same, except for which
 	   auth socket they connect to. */
 	userdb = len > 7 && strcmp(name + len - 7, "-userdb") == 0;
-	socket_path = userdb ? userdb_socket_path : auth_socket_path;
+	socket_path = userdb ? AUTH_USERDB_SOCKET_PATH : AUTH_SOCKET_PATH;
 	auth = auth_connection_init(socket_path);
 	if (auth_connection_connect(auth) == 0) {
 		master_service_client_connection_accept(conn);
@@ -151,11 +150,6 @@ static void main_preinit(void)
 
 	set = master_service_settings_get_others(master_service)[0];
 
-	auth_socket_path = i_strconcat(set->base_dir,
-				       "/"AUTH_SOCKET_PATH, NULL);
-	userdb_socket_path = i_strconcat(set->base_dir,
-					 "/"AUTH_USERDB_SOCKET_PATH, NULL);
-
 	listen_port = find_inet_listener_port(&listen_ip, set);
 	if (listen_port == 0 && *set->director_servers != '\0') {
 		i_fatal("No inet_listeners defined for director service "
@@ -179,8 +173,6 @@ static void main_deinit(void)
 	doveadm_connections_deinit();
 	login_connections_deinit();
 	auth_connections_deinit();
-	i_free(auth_socket_path);
-	i_free(userdb_socket_path);
 }
 
 int main(int argc, char *argv[])