more fixups.

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

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 1d06392e7b85b9a66d7eade88b0758bb7fe0f4d5..ef808f58efc26e3466865afe9cfef82033f9e247 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -582,7 +582,7 @@ daemon_fork(struct daemon* daemon)
                dnsc_apply_cfg(daemon->dnscenv, daemon->cfg);
 #else
                fatal_exit("dnscrypt enabled in config but unbound was not built with "
-                                  "dnscypt support");
+                                  "dnscrypt support");
 #endif
        }
        /* create global local_zones */

diff --git a/dnscrypt/dnscrypt.c b/dnscrypt/dnscrypt.c
index d998ae98bdb2e5c36bf036d38ed43e2ebd2a83e4..96e5204a9a6aa382a797e2f9166d3b4d14fc0962 100644 (file)
--- a/dnscrypt/dnscrypt.c
+++ b/dnscrypt/dnscrypt.c
@@ -72,7 +72,8 @@ dnscrypt_server_uncurve(const KeyPair *keypair,
         return -1;
     }
 
-    while (*sldns_buffer_at(buffer, --len) == 0);
+    while (*sldns_buffer_at(buffer, --len) == 0)
+           ;
 
     if (*sldns_buffer_at(buffer, len) != 0x80) {
         return -1;
@@ -137,7 +138,7 @@ dnscrypt_hrtime(void)
     uint64_t ts = (uint64_t)0U;
     int ret;
 
-    ret = evutil_gettimeofday(&tv, NULL);
+    ret = gettimeofday(&tv, NULL);
     assert(ret == 0);
     if (ret == 0) {
         ts = (uint64_t)tv.tv_sec * 1000000U + (uint64_t)tv.tv_usec;
@@ -281,7 +282,7 @@ dnsc_parse_certs(struct dnsc_env *env, struct config_file *cfg)
                                head->str,
                                (char *)(env->signed_certs + signed_cert_id),
                                sizeof(struct SignedCert)) != 0) {
-                       fatal_exit("dnsc_parse_certs: failed to load %s", head->str);
+                       fatal_exit("dnsc_parse_certs: failed to load %s: %s", head->str, strerror(errno));
                }
                verbose(VERB_OPS, "Loaded cert %s", head->str);
        }
@@ -419,7 +420,7 @@ dnsc_parse_keys(struct dnsc_env *env, struct config_file *cfg)
                                head->str,
                                (char *)(env->keypairs[keypair_id].crypt_secretkey),
                                crypto_box_SECRETKEYBYTES) != 0) {
-                       fatal_exit("dnsc_parse_keys: failed to load %s", head->str);
+                       fatal_exit("dnsc_parse_keys: failed to load %s: %s", head->str, strerror(errno));
                }
                verbose(VERB_OPS, "Loaded key %s", head->str);
                if (crypto_scalarmult_base(env->keypairs[keypair_id].crypt_publickey,

diff --git a/dnscrypt/dnscrypt.h b/dnscrypt/dnscrypt.h
index aa1d9f2ee4a4957f7738f1974c9670a3fa82a376..59d6c5402d1a2b78515bb6bfc9006a4830f82e39 100644 (file)
--- a/dnscrypt/dnscrypt.h
+++ b/dnscrypt/dnscrypt.h
@@ -58,7 +58,7 @@ struct dnscrypt_query_header {
 /**
  * Initialize DNSCrypt enviroment.
  * Initialize sodium library and allocate the dnsc_env structure.
- * \return an unitialized struct dnsc_env.
+ * \return an uninitialized struct dnsc_env.
  */
 struct dnsc_env * dnsc_create(void);
 

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 0fe96b1e486713d1eb8212475c183bb7dc9ddb3c..e39ebb58bfbc88e10104ae2578a56e7628f65f61 100644 (file)
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1072,6 +1072,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
                        (!strchr(ifname, '@') && atoi(port) == dnscrypt_port));
 #else
        int is_dnscrypt = 0;
+       (void)dnscrypt_port;
 #endif
 
        if(!do_udp && !do_tcp)