dovecot-2.1: director: Don't explicitly use base_dir. We're alre...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Dec 8 05:03:37 EET 2011
details: http://hg.dovecot.org/dovecot-2.1/rev/ddf28d10ff0f
changeset: 13809:ddf28d10ff0f
user: Timo Sirainen <tss at iki.fi>
date: Thu Dec 08 05:02:15 2011 +0200
description:
director: Don't explicitly use base_dir. We're already chdired there, use relative paths.
diffstat:
src/director/Makefile.am | 3 +--
src/director/director-settings.c | 2 --
src/director/director-settings.h | 1 -
src/director/director.c | 4 +---
src/director/main.c | 10 +---------
5 files changed, 3 insertions(+), 17 deletions(-)
diffs (105 lines):
diff -r 3027626f7239 -r ddf28d10ff0f src/director/Makefile.am
--- a/src/director/Makefile.am Thu Dec 08 05:02:12 2011 +0200
+++ b/src/director/Makefile.am Thu Dec 08 05:02:15 2011 +0200
@@ -7,8 +7,7 @@
-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 -r 3027626f7239 -r ddf28d10ff0f src/director/director-settings.c
--- a/src/director/director-settings.c Thu Dec 08 05:02:12 2011 +0200
+++ b/src/director/director-settings.c Thu Dec 08 05:02:15 2011 +0200
@@ -64,7 +64,6 @@
{ 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 @@
};
const struct director_settings director_default_settings = {
- .base_dir = PKG_RUNDIR,
.master_user_separator = "",
.director_servers = "",
diff -r 3027626f7239 -r ddf28d10ff0f src/director/director-settings.h
--- a/src/director/director-settings.h Thu Dec 08 05:02:12 2011 +0200
+++ b/src/director/director-settings.h Thu Dec 08 05:02:15 2011 +0200
@@ -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 -r 3027626f7239 -r ddf28d10ff0f src/director/director.c
--- a/src/director/director.c Thu Dec 08 05:02:12 2011 +0200
+++ b/src/director/director.c Thu Dec 08 05:02:15 2011 +0200
@@ -576,7 +576,6 @@
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 @@
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 -r 3027626f7239 -r ddf28d10ff0f src/director/main.c
--- a/src/director/main.c Thu Dec 08 05:02:12 2011 +0200
+++ b/src/director/main.c Thu Dec 08 05:02:15 2011 +0200
@@ -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 @@
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 @@
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 @@
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[])
More information about the dovecot-cvs
mailing list