X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=7b8a2e3d6b1eb32ddb0bd908c96fbda7244ab756;hb=eb94eab34a0893fb5b8f78652f338df85f492a9b;hp=c30260fd6318cbb2d47d5792fe34a8adbf9f0943;hpb=a799cc2909f47d918d1ec7171a9edba28a9f5136;p=onak.git diff --git a/onak-conf.c b/onak-conf.c index c30260f..7b8a2e3 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -58,7 +58,7 @@ struct onak_config config = { .dbinit = NULL, #endif - .clean_policies = ONAK_CLEAN_CHECK_SIGHASH, + .clean_policies = ONAK_CLEAN_DROP_V3_KEYS | ONAK_CLEAN_CHECK_SIGHASH, .bin_dir = NULL, .mail_dir = NULL, @@ -284,6 +284,15 @@ static bool parseconfigline(char *line) config.syncsites = lladd(config.syncsites, strdup(value)); /* [verification] section */ + } else if (MATCH("verification", "drop_v3")) { + if (parsebool(value, config.clean_policies & + ONAK_CLEAN_DROP_V3_KEYS)) { + config.clean_policies |= + ONAK_CLEAN_DROP_V3_KEYS; + } else { + config.clean_policies &= + ~ONAK_CLEAN_DROP_V3_KEYS; + } } else if (MATCH("verification", "check_sighash")) { if (parsebool(value, config.clean_policies & ONAK_CLEAN_CHECK_SIGHASH)) { @@ -382,6 +391,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,