misc nitpicks (see commits)

diff --git a/README.md b/README.md
index 525cc81f02e105345d408a535b8d7db06e3687b9..126ee9cb47da36697a1cb62b8e90fb3402ed2993 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Knot Resolver
 
-[![Build Status](https://gitlab.labs.nic.cz/knot/knot-resolver/badges/master/pipeline.svg?x)](https://gitlab.labs.nic.cz/knot/knot-resolver/commits/master)
-[![Coverage Status](https://gitlab.labs.nic.cz/knot/knot-resolver/badges/master/coverage.svg?x)](https://knot.pages.labs.nic.cz/knot-resolver/)
+[![Build Status](https://gitlab.labs.nic.cz/knot/knot-resolver/badges/nightly/pipeline.svg?x)](https://gitlab.labs.nic.cz/knot/knot-resolver/commits/nightly)
+[![Coverage Status](https://gitlab.labs.nic.cz/knot/knot-resolver/badges/nightly/coverage.svg?x)](https://knot.pages.labs.nic.cz/knot-resolver/)
 [![Coverity](https://img.shields.io/coverity/scan/3912.svg)](https://scan.coverity.com/projects/3912)
 [![Documentation Status](https://readthedocs.org/projects/knot-resolver/badge/?version=latest)](https://readthedocs.org/projects/knot-resolver/?badge=latest)
 

diff --git a/daemon/tls_ephemeral_credentials.c b/daemon/tls_ephemeral_credentials.c
index 6fe86b84e0547becaa4b655a25553b2602f146b6..7c26d24b8742a4a143344307ce4031e255bcdabf 100644 (file)
--- a/daemon/tls_ephemeral_credentials.c
+++ b/daemon/tls_ephemeral_credentials.c
@@ -145,7 +145,9 @@ static gnutls_x509_privkey_t get_ephemeral_privkey ()
                                ssize_t bytes_written;
                                bytes_written = write(datafd, data.data, data.size);
                                if (bytes_written != data.size)
-                                       kr_log_error("[tls] failed to write %d octets to " EPHEMERAL_PRIVKEY_FILENAME " (%ld written)\n",
+                                       kr_log_error("[tls] failed to write %d octets to "
+                                                    EPHEMERAL_PRIVKEY_FILENAME
+                                                    " (%zd written)\n",
                                                     data.size, bytes_written);
                        }
                }

diff --git a/modules/ta_sentinel/ta_sentinel.lua b/modules/ta_sentinel/ta_sentinel.lua
index 8a1f7ed33d2e8f186d9dd8a84aa9188679b49a0d..4ee6348c911be072a26f1ddf8a324e24a1bf92e8 100644 (file)
--- a/modules/ta_sentinel/ta_sentinel.lua
+++ b/modules/ta_sentinel/ta_sentinel.lua
@@ -31,6 +31,7 @@ function M.layer.finish(state, req, pkt)
                sentype = false
                keytag = qname:match('^root%-key%-sentinel%-not%-ta%-(%x+)%.')
        end
+       if not keytag then return state end
 
        if kreq.rank ~= ffi.C.KR_RANK_SECURE or kreq.answer:cd() then
                if verbose() then