Remove --with-systemd option to dh

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index 7b8a2e3d6b1eb32ddb0bd908c96fbda7244ab756..6d67a74610c81b06f1677badca51a10e1f1a7378 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)) {
@@ -311,6 +313,45 @@ static bool parseconfigline(char *line)
                                config.clean_policies &=
                                        ~ONAK_CLEAN_LARGE_PACKETS;
                        }
+               } else if (MATCH("verification", "require_other_sig")) {
+#if HAVE_CRYPTO
+                       if (parsebool(value, config.clean_policies &
+                                       ONAK_CLEAN_NEED_OTHER_SIG)) {
+                               config.clean_policies |=
+                                       ONAK_CLEAN_NEED_OTHER_SIG;
+                       } else {
+                               config.clean_policies &=
+                                       ~ONAK_CLEAN_NEED_OTHER_SIG;
+                       }
+#else
+                       logthing(LOGTHING_ERROR,
+                                       "Compiled without crypto support, "
+                                       "require_other_sig not available.");
+#endif
+               } else if (MATCH("verification", "update_only")) {
+                       if (parsebool(value, config.clean_policies &
+                                       ONAK_CLEAN_UPDATE_ONLY)) {
+                               config.clean_policies |=
+                                       ONAK_CLEAN_UPDATE_ONLY;
+                       } else {
+                               config.clean_policies &=
+                                       ~ONAK_CLEAN_UPDATE_ONLY;
+                       }
+               } else if (MATCH("verification", "verify_signatures")) {
+#if HAVE_CRYPTO
+                       if (parsebool(value, config.clean_policies &
+                                       ONAK_CLEAN_VERIFY_SIGNATURES)) {
+                               config.clean_policies |=
+                                       ONAK_CLEAN_VERIFY_SIGNATURES;
+                       } else {
+                               config.clean_policies &=
+                                       ~ONAK_CLEAN_VERIFY_SIGNATURES;
+                       }
+#else
+                       logthing(LOGTHING_ERROR,
+                                       "Compiled without crypto support, "
+                                       "verify_signatures not available.");
+#endif
                } else {
                        return false;
                }
@@ -602,4 +643,7 @@ void cleanupconfig(void) {
                free(config.mail_dir);
                config.mail_dir = NULL;
        }
+       if (config.blacklist.count != 0) {
+               array_free(&config.blacklist);
+       }
 }