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

diff --git a/src/director/director.h b/src/director/director.h
index 059f3d0d6b81b00989d6eef3b023f24b0a494e29..b673852d185d4798dff6088f6f31a03b1ae84c1c 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 b28e7d90d7b2548285e1e6cc744fc73b94423c8a..c4d479107de3e28e269c033463e0f0dc6d031bc5 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;