[Minor] Fix include/exclude policy

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 7d19b6d2df8eddaec7a0c49dfe488fb655dd732c..a6d8be896b4e0c8de0bbe086ecdcaee52489ca06 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -783,6 +783,8 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
                        session->reply.rep.v1.value = 0;
                }
 
+               bool default_disabled = false;
+
                {
                        khiter_t k;
 
@@ -790,10 +792,7 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
 
                        if (k != kh_end(session->ctx->default_forbidden_ids)) {
                                /* Hash is from a forbidden flag by default */
-                               session->reply.rep.ts = 0;
-                               session->reply.rep.v1.prob = 0.0f;
-                               session->reply.rep.v1.value = 0;
-                               session->reply.rep.v1.flag = 0;
+                               default_disabled = true;
                        }
                }
 
@@ -812,6 +811,13 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
                                        session->reply.rep.v1.flag = 0;
                                }
                        }
+                       else if (default_disabled) {
+                               /* Hash is from a forbidden flag by default */
+                               session->reply.rep.ts = 0;
+                               session->reply.rep.v1.prob = 0.0f;
+                               session->reply.rep.v1.value = 0;
+                               session->reply.rep.v1.flag = 0;
+                       }
 
                        /* We need also to encrypt reply */
                        ottery_rand_bytes (session->reply.hdr.nonce,
@@ -836,6 +842,13 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
                                        session->reply.hdr.mac,
                                        RSPAMD_CRYPTOBOX_MODE_25519);
                }
+               else if (default_disabled) {
+                       /* Hash is from a forbidden flag by default, and there is no encryption override */
+                       session->reply.rep.ts = 0;
+                       session->reply.rep.v1.prob = 0.0f;
+                       session->reply.rep.v1.value = 0;
+                       session->reply.rep.v1.flag = 0;
+               }
        }
 
        rspamd_fuzzy_write_reply (session);