- Fix that unbound-control can set val_clean_additional and val_permissive_mode.

git-svn-id: file:///svn/unbound/trunk@4209 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/validator/validator.c b/validator/validator.c
index e8b6317f6e6b8a85445fc9b581e3f3561a8d60cd..c1f5f57f6c221f10b60097776e1a97b9ac37b759 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -113,8 +113,6 @@ val_apply_cfg(struct module_env* env, struct val_env* val_env,
 {
        int c;
        val_env->bogus_ttl = (uint32_t)cfg->bogus_ttl;
-       val_env->clean_additional = cfg->val_clean_additional;
-       val_env->permissive_mode = cfg->val_permissive_mode;
        if(!env->anchors)
                env->anchors = anchors_create();
        if(!env->anchors) {
@@ -171,7 +169,6 @@ val_init(struct module_env* env, int id)
        }
        env->modinfo[id] = (void*)val_env;
        env->need_to_validate = 1;
-       val_env->permissive_mode = 0;
        lock_basic_init(&val_env->bogus_lock);
        lock_protect(&val_env->bogus_lock, &val_env->num_rrset_bogus,
                sizeof(val_env->num_rrset_bogus));
@@ -619,9 +616,11 @@ validate_msg_signatures(struct module_qstate* qstate, struct module_env* env,
                }
        }
 
-       /* attempt to validate the ADDITIONAL section rrsets */
-       if(!ve->clean_additional)
+       /* If set, the validator should clean the additional section of
+        * secure messages. */
+       if(!env->cfg->val_clean_additional)
                return 1;
+       /* attempt to validate the ADDITIONAL section rrsets */
        for(i=chase_reply->an_numrrsets+chase_reply->ns_numrrsets; 
                i<chase_reply->rrset_count; i++) {
                s = chase_reply->rrsets[i];
@@ -2170,8 +2169,14 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
                                free(err);
                        }
                }
+               /*
+                * If set, the validator will not make messages bogus, instead
+                * indeterminate is issued, so that no clients receive SERVFAIL.
+                * This allows an operator to run validation 'shadow' without
+                * hurting responses to clients.
+                */
                /* If we are in permissive mode, bogus gets indeterminate */
-               if(ve->permissive_mode)
+               if(qstate->env->cfg->val_permissive_mode)
                        vq->orig_msg->rep->security = sec_status_indeterminate;
        }
 

diff --git a/validator/validator.h b/validator/validator.h
index 23d3072427a2ac32eff3e073a653709e23023a62..9a591078f71c10126b99faf12cc8e8798aabe60a 100644 (file)
--- a/validator/validator.h
+++ b/validator/validator.h
@@ -93,19 +93,6 @@ struct val_env {
         * seconds. */
        uint32_t bogus_ttl;
 
-       /** If set, the validator should clean the additional section of
-        * secure messages.
-        */
-       int clean_additional;
-
-       /**
-        * If set, the validator will not make messages bogus, instead
-        * indeterminate is issued, so that no clients receive SERVFAIL.
-        * This allows an operator to run validation 'shadow' without
-        * hurting responses to clients.
-        */
-       int permissive_mode;
-
        /**
         * Number of entries in the NSEC3 maximum iteration count table.
         * Keep this table short, and sorted by size