From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Fri, 30 Jun 2023 22:06:32 +0000 (-0600)
Subject: Delete --init-locations
X-Git-Tag: 1.6.0~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=678530fe1da825ca3dd5bc008425926dd15f26b2;p=thirdparty%2FFORT-validator.git

Delete --init-locations

It was deprecated a long time ago.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 120f4385..87ba5883 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,6 @@ fort_SOURCES += config/log_conf.h config/log_conf.c
 fort_SOURCES += config/mode.c config/mode.h
 fort_SOURCES += config/incidences.h config/incidences.c
 fort_SOURCES += config/output_format.h config/output_format.c
-fort_SOURCES += config/init_tals.h config/init_tals.c
 fort_SOURCES += config/rsync_strategy.h config/rsync_strategy.c
 fort_SOURCES += config/str.c config/str.h
 fort_SOURCES += config/string_array.h config/string_array.c
diff --git a/src/config.c b/src/config.c
index ab103a2d..ba3f5c69 100644
--- a/src/config.c
+++ b/src/config.c
@@ -18,7 +18,6 @@
 #include "log.h"
 #include "config/boolean.h"
 #include "config/incidences.h"
-#include "config/init_tals.h"
 #include "config/str.h"
 #include "config/uint.h"
 #include "config/work_offline.h"
@@ -195,9 +194,6 @@ struct rpki_config {
 	/* Download AS0 TALs into --tal? */
 	bool init_tal0s;
 
-	/* Deprecated; currently does nothing. */
-	unsigned int init_tal_locations;
-
 	/* Thread pools for specific tasks */
 	struct {
 		/* Threads related to RTR server */
@@ -736,13 +732,6 @@ static const struct option_field options[] = {
 		.offset = offsetof(struct rpki_config, init_tal0s),
 		.doc = "Fetch the currently-known AS0 TAL files into --tal",
 		.availability = AVAILABILITY_GETOPT,
-	}, {
-		.id = 11001,
-		.name = "init-locations",
-		.type = &gt_init_tals_locations,
-		.offset = offsetof(struct rpki_config, init_tal_locations),
-		.doc = "Deprecated. Does nothing as of Fort 1.5.1.",
-		.availability = AVAILABILITY_JSON,
 	},
 
 	{
@@ -978,7 +967,6 @@ set_default_values(void)
 
 	rpki_config.asn1_decode_max_stack = 4096; /* 4kB */
 	rpki_config.init_tals = false;
-	rpki_config.init_tal_locations = 0;
 
 	rpki_config.thread_pool.server.max = 20;
 	rpki_config.thread_pool.validation.max = 5;
diff --git a/src/config/init_tals.c b/src/config/init_tals.c
deleted file mode 100644
index bc342791..00000000
--- a/src/config/init_tals.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "config/init_tals.h"
-
-static int
-init_tals_parse_json(struct option_field const *opt, json_t *json, void *result)
-{
-	/* This is deprecated. Please delete it in the future. */
-	return 0;
-}
-
-const struct global_type gt_init_tals_locations = {
-	.print = NULL,
-	.parse.json = init_tals_parse_json,
-};
diff --git a/src/config/init_tals.h b/src/config/init_tals.h
deleted file mode 100644
index a0fbe2ef..00000000
--- a/src/config/init_tals.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef SRC_CONFIG_INIT_TALS_H_
-#define SRC_CONFIG_INIT_TALS_H_
-
-#include "config/types.h"
-
-extern const struct global_type gt_init_tals_locations;
-
-#endif /* SRC_CONFIG_INIT_TALS_H_ */