Move plugin init to own file.

src/CMakeLists.txt

@@ -44,7 +44,7 @@ set (MOSQ_SRCS
 	persist_write_v5.c persist_write.c
 	persist.h
 	plugin.c plugin_v4.c plugin_v3.c plugin_v2.c
-	plugin_cleanup.c
+	plugin_init.c plugin_cleanup.c
 	plugin_acl_check.c plugin_basic_auth.c plugin_connect.c plugin_disconnect.c
 	plugin_extended_auth.c plugin_message.c plugin_psk_key.c plugin_public.c
 	plugin_tick.c
@@ -53,7 +53,7 @@ set (MOSQ_SRCS
 	read_handle.c
 	../lib/read_handle.h
 	retain.c
-	security.c security_default.c
+	security_default.c
 	../lib/send_mosq.c ../lib/send_mosq.h
 	send_auth.c
 	send_connack.c

src/Makefile

@@ -65,13 +65,13 @@ OBJS=	mosquitto.o \
 		plugin_connect.o \
 		plugin_disconnect.o \
 		plugin_extended_auth.o \
+		plugin_init.o \
 		plugin_message.o \
 		plugin_psk_key.o \
 		plugin_public.o \
 		plugin_tick.o \
 		read_handle.o \
 		retain.o \
-		security.o \
 		security_default.o \
 		send_auth.o \
 		send_connack.o \
@@ -293,6 +293,9 @@ plugin_disconnect.o : plugin_disconnect.c ../include/mosquitto_plugin.h mosquitt
 plugin_extended_auth.o : plugin_extended_auth.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
 
+plugin_init.o : plugin_init.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
+	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
+
 plugin_message.o : plugin_message.c ../include/mosquitto_plugin.h mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
 
@@ -311,9 +314,6 @@ read_handle.o : read_handle.c mosquitto_broker_internal.h
 retain.o : retain.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
 
-security.o : security.c mosquitto_broker_internal.h
-	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
-
 security_default.o : security_default.c mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) -c $< -o $@
 

src/mosquitto_broker_internal.h

@@ -875,7 +875,6 @@ int mosquitto_security_module_init(void);
 int mosquitto_security_module_cleanup(void);
 
 int mosquitto_security_init(bool reload);
-int mosquitto_security_apply(void);
 int mosquitto_security_cleanup(bool reload);
 int mosquitto_acl_check(struct mosquitto *context, const char *topic, uint32_t payloadlen, void* payload, uint8_t qos, bool retain, int access);
 int mosquitto_unpwd_check(struct mosquitto *context);

src/plugin_init.c

@@ -207,14 +207,3 @@ int mosquitto_security_init(bool reload)
 	}
 	return mosquitto_security_init_default(reload);
 }
-
-/* Apply security settings after a reload.
- * Includes:
- * - Disconnecting anonymous users if appropriate
- * - Disconnecting users with invalid passwords
- * - Reapplying ACLs
- */
-int mosquitto_security_apply(void)
-{
-	return mosquitto_security_apply_default();
-}

src/signals.c

@@ -107,7 +107,7 @@ void signal__flag_check(void)
 		listeners__reload_all_certificates();
 		mosquitto_security_cleanup(true);
 		mosquitto_security_init(true);
-		mosquitto_security_apply();
+		mosquitto_security_apply_default();
 		log__close(db.config);
 		log__init(db.config);
 		keepalive__cleanup();