Add blank line before armoured PGP data

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index 8925dbcb6a970d94ae5ab7a12a6865ff182d1c71..f0768a0f11657f008ccf8623e7f3a9a82493233d 100644 (file)
--- 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);
+       }
 }