Move declaration of virtual_servers_on_read_config

FreeRADIUS · May 24, 2018 · e35b076 · e35b076
1 parent b35b39d
commit e35b076
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/src/include/modules.h b/src/include/modules.h
@@ -288,7 +288,9 @@ rlm_rcode_t	process_post_auth(int type, REQUEST *request);
 #else
 #  define MODULE_NULL_COA_FUNCS
 #endif
+
 extern const CONF_PARSER virtual_servers_config[];
+extern const CONF_PARSER virtual_servers_on_read_config[];
 
 typedef int (*fr_virtual_server_compile_t)(CONF_SECTION *server);
 

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
@@ -257,9 +257,6 @@ static const CONF_PARSER switch_users_config[] = {
 	CONF_PARSER_TERMINATOR
 };
 
-
-extern const CONF_PARSER virtual_servers_on_read_config[];
-
 /** Callback to automatically load dictionaries required by modules
  *
  * @param[in] module	being loaded.

diff --git a/src/main/virtual_servers.c b/src/main/virtual_servers.c
@@ -97,15 +97,12 @@ static fr_virtual_server_t **virtual_servers;
  */
 static CONF_SECTION *virtual_server_root;
 
-#if 0
 static int listen_on_read(TALLOC_CTX *ctx, void *out, CONF_ITEM *ci, CONF_PARSER const *rule);
 static int server_on_read(TALLOC_CTX *ctx, void *out, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule);
-#endif
 
 static int listen_parse(TALLOC_CTX *ctx, void *out, CONF_ITEM *ci, CONF_PARSER const *rule);
 static int server_parse(TALLOC_CTX *ctx, void *out, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule);
 
-#if 0
 static const CONF_PARSER listen_on_read_config[] = {
 	{ FR_CONF_OFFSET("listen", FR_TYPE_SUBSECTION | FR_TYPE_MULTI | FR_TYPE_OK_MISSING | FR_TYPE_ON_READ,
 			 fr_virtual_server_t, listener), \
@@ -115,7 +112,7 @@ static const CONF_PARSER listen_on_read_config[] = {
 	CONF_PARSER_TERMINATOR
 };
 
-static const CONF_PARSER virtual_servers_on_read_config[] = {
+const CONF_PARSER virtual_servers_on_read_config[] = {
 	/*
 	 *	Not really ok if it's missing but we want to
 	 *	let logic elsewhere handle the issue.
@@ -127,7 +124,6 @@ static const CONF_PARSER virtual_servers_on_read_config[] = {
 
 	CONF_PARSER_TERMINATOR
 };
-#endif
 
 static const CONF_PARSER server_config[] = {
 	{ FR_CONF_OFFSET("namespace", FR_TYPE_STRING, fr_virtual_server_t, namespace) },
@@ -153,7 +149,6 @@ const CONF_PARSER virtual_servers_config[] = {
 	CONF_PARSER_TERMINATOR
 };
 
-#if 0
 /** dl_open a proto_* module
  *
  * @param[in] ctx	to allocate data in.
@@ -199,7 +194,6 @@ static int server_on_read(UNUSED TALLOC_CTX *ctx, UNUSED void *out, UNUSED CONF_
 
 	return 0;
 }
-#endif
 
 /** dl_open a proto_* module
  *