X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=f0768a0f11657f008ccf8623e7f3a9a82493233d;hb=3886942162fd8193d8a804a685a3f96a65b9712c;hp=8925dbcb6a970d94ae5ab7a12a6865ff182d1c71;hpb=2708d5a06ad2ef872ea89aca822328f98a86e7cb;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index 8925dbc..f0768a0 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -284,6 +284,8 @@ static bool parseconfigline(char *line)
 			config.syncsites = lladd(config.syncsites,
 				strdup(value));
 		/* [verification] section */
+		} else if (MATCH("verification", "blacklist")) {
+			array_load(&config.blacklist, value);
 		} else if (MATCH("verification", "drop_v3")) {
 			if (parsebool(value, config.clean_policies &
 					ONAK_CLEAN_DROP_V3_KEYS)) {
@@ -391,6 +393,12 @@ void readconfig(const char *configfile) {
 		conffile = fopen(configfile, "r");
 	}
 
+	if (oldstyle) {
+		logthing(LOGTHING_CRITICAL, "Reading deprecated old-style "
+				"configuration file. This will not be "
+				"supported in the next release.");
+	}
+
 	if (conffile != NULL) {
 		if (!fgets(curline, 1023, conffile)) {
 			logthing(LOGTHING_CRITICAL,
@@ -596,4 +604,7 @@ void cleanupconfig(void) {
 		free(config.mail_dir);
 		config.mail_dir = NULL;
 	}
+	if (config.blacklist.count != 0) {
+		array_free(&config.blacklist);
+	}
 }