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

diff --git a/src/director/director.h b/src/director/director.h
index 35e34fb08132508b836c8b2cece6de183d7361f4..bed2875125c6a16370198c62138151a9adef5b81 100644 (file)
--- 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 71a70ebb2624578d192c7406a24f235fb8bca745..713ad959a2987bac3e91f89714ded0f8d6a2916d 100644 (file)
--- 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;