avoid failing hard if 'gnunetcheck' db does not exist

[oweals/gnunet.git] / src / util / dnsparser.c

diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index 79d723f120915e2e44412db180a1427556a4f7f8..7546ca1e970999deaf9fcba5505f70f63a86376a 100644 (file)
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      Copyright (C) 2010-2014 GNUnet e.V.
+      Copyright (C) 2010-2014, 2018 GNUnet e.V.
 
       GNUnet is free software: you can redistribute it and/or modify it
       under the terms of the GNU Affero General Public License as published
@@ -14,6 +14,8 @@
 
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
@@ -23,10 +25,18 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#if defined(HAVE_LIBIDN2)
+#if HAVE_LIBIDN2
+#if HAVE_IDN2_H
 #include <idn2.h>
-#elif defined(HAVE_LIBIDN)
+#elif HAVE_IDN2_IDN2_H
+#include <idn2/idn2.h>
+#endif
+#elif HAVE_LIBIDN
+#if HAVE_IDNA_H
 #include <idna.h>
+#elif HAVE_IDN_IDNA_H
+#include <idn/idna.h>
+#endif
 #endif
 #if WINDOWS
 #include <idn-free.h>
@@ -1078,12 +1088,19 @@ GNUNET_DNSPARSER_builder_add_cert (char *dst,
 {
   struct GNUNET_TUN_DnsCertRecord dcert;
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
   if ( (cert->cert_type > UINT16_MAX) ||
        (cert->algorithm > UINT8_MAX) )
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
   if (*off + sizeof (struct GNUNET_TUN_DnsCertRecord) + cert->certificate_size > dst_len)
     return GNUNET_NO;
   dcert.cert_type = htons ((uint16_t) cert->cert_type);