Turn duplicates into warnings for dnscrypt, and

fix declaration and code mix warning.

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

diff --git a/dnscrypt/dnscrypt.c b/dnscrypt/dnscrypt.c
index 8103107b2ab06dcd57e7ba5e24ed9baab9656120..b72c62f319f7e83e1e6808757b58a44689a686a3 100644 (file)
--- a/dnscrypt/dnscrypt.c
+++ b/dnscrypt/dnscrypt.c
@@ -710,7 +710,9 @@ dnsc_load_local_data(struct dnsc_env* dnscenv, struct config_file *cfg)
     for(i=0; i<dnscenv->signed_certs_count; i++) {
         const char *ttl_class_type = " 86400 IN TXT \"";
         int rotated_cert = 0;
-               uint32_t serial;
+       uint32_t serial;
+       uint16_t rrlen;
+       char* rr;
         struct SignedCert *cert = dnscenv->signed_certs + i;
                // Check if the certificate is being rotated and should not be published
         for(j=0; j<dnscenv->rotated_certs_count; j++){
@@ -730,12 +732,12 @@ dnsc_load_local_data(struct dnsc_env* dnscenv, struct config_file *cfg)
             );
             continue;
         }
-        uint16_t rrlen = strlen(dnscenv->provider_name) +
+        rrlen = strlen(dnscenv->provider_name) +
                          strlen(ttl_class_type) +
                          4 * sizeof(struct SignedCert) + // worst case scenario
                          1 + // trailing double quote
                          1;
-        char *rr = malloc(rrlen);
+        rr = malloc(rrlen);
         if(!rr) {
             log_err("Could not allocate memory");
             return -2;

diff --git a/util/configparser.c b/util/configparser.c
index a9361863dbbab0ba6ee48ea7e06bb501d4a8ee16..e10165ea3c38d27a3801827f3e906285e68c4edc 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -5090,7 +5090,7 @@ yyreduce:
     {
                OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
                if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
-                       fatal_exit("dnscrypt-provider-cert %s is a duplicate", (yyvsp[0].str));
+                       log_warn("dnscrypt-provider-cert %s is a duplicate", (yyvsp[0].str));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
                        fatal_exit("out of memory adding dnscrypt-provider-cert");
        }
@@ -5112,7 +5112,7 @@ yyreduce:
     {
                OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
                if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
-                       fatal_exit("dnscrypt-secret-key: %s is a duplicate", (yyvsp[0].str));
+                       log_warn("dnscrypt-secret-key: %s is a duplicate", (yyvsp[0].str));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
                        fatal_exit("out of memory adding dnscrypt-secret-key");
        }

diff --git a/util/configparser.y b/util/configparser.y
index 75e88e7eabcf2a4b32b564b7f9cb6d794f3a59a9..af4cda1a6e2a5ba8477b7d127cb127553ef1c8ad 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -2377,7 +2377,7 @@ dnsc_dnscrypt_provider_cert: VAR_DNSCRYPT_PROVIDER_CERT STRING_ARG
        {
                OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", $2));
                if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, $2))
-                       fatal_exit("dnscrypt-provider-cert %s is a duplicate", $2);
+                       log_warn("dnscrypt-provider-cert %s is a duplicate", $2);
                if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, $2))
                        fatal_exit("out of memory adding dnscrypt-provider-cert");
        }
@@ -2393,7 +2393,7 @@ dnsc_dnscrypt_secret_key: VAR_DNSCRYPT_SECRET_KEY STRING_ARG
        {
                OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", $2));
                if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, $2))
-                       fatal_exit("dnscrypt-secret-key: %s is a duplicate", $2);
+                       log_warn("dnscrypt-secret-key: %s is a duplicate", $2);
                if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, $2))
                        fatal_exit("out of memory adding dnscrypt-secret-key");
        }