From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 25 Oct 2016 18:47:01 +0000 (+0300)
Subject: director: Code cleanup - global director is no longer needed.
X-Git-Tag: 2.2.26~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83d28111bc7850f41b99c3d127ea6b0cc4015253;p=thirdparty%2Fdovecot%2Fcore.git

director: Code cleanup - global director is no longer needed.
---

diff --git a/src/director/director.h b/src/director/director.h
index 35e34fb081..bed2875125 100644
--- a/src/director/director.h
+++ b/src/director/director.h
@@ -153,7 +153,6 @@ struct director {
 };
 
 extern bool director_debug;
-extern struct director *director; /* FIXME: shouldn't be global */
 
 /* Create a new director. If listen_ip specifies an actual IP, it's used with
    listen_port for finding ourself from the director_servers setting.
diff --git a/src/director/main.c b/src/director/main.c
index 71a70ebb26..713ad959a2 100644
--- a/src/director/main.c
+++ b/src/director/main.c
@@ -35,7 +35,7 @@ enum director_socket_type {
 	DIRECTOR_SOCKET_TYPE_DOVEADM
 };
 
-struct director *director;
+static struct director *director;
 static struct notify_connection *notify_conn;
 static struct timeout *to_proctitle_refresh;
 static ARRAY(enum director_socket_type) listener_socket_types;