From a279ad98ef57d52c408db4b2085f5374dfb6abd2 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@samizdat>
Date: Thu, 30 Sep 2021 05:30:19 -0400
Subject: improve "cryptonomic" output, replacing drill with delv

---
 selfpublish.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/selfpublish.sh b/selfpublish.sh
index 7e418e1..9a151f5 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -77,12 +77,12 @@ dependencies()
     cat <<EOF
 apache2 (>= 2.4.46)
 basez
+bind9-dnsutils
 cgit
 curl
 fortune-mod
 fortunes-min
 gnupg (>= 2.2.14)
-ldnsutils
 libssl1.1 (>= 1.1.1d)
 netmask
 openssl
@@ -456,9 +456,10 @@ then
     2>/dev/null withsetx ssh-keyscan "$hostname"
     2>/dev/null withsetx dig +nocmd -taaaa "$hostname" +noall +answer
     2>/dev/null withsetx dig +nocmd "$hostname" +noall +answer
-    2>/dev/null withsetx drill -DS -t sshfp "$hostname"
     2>&1 withsetx gpg --locate-keys "$uid"
-    2>&1 withsetx ssh -o BatchMode=yes -o HostKeyAlgorithms=ssh-ed25519 -o VerifyHostKeyDNS=yes -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null "$hostname" -- true
+    2>/dev/null withsetx delv @1.1.1.1 -t sshfp "$hostname"
+    export hostname
+    2>&1 withsetx sh -c 'ssh -v -i /dev/null -o BatchMode=yes -o HostKeyAlgorithms=ssh-ed25519 -o VerifyHostKeyDNS=yes -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null "$hostname" -- true 2>&1 | tee cryptonomic.ssh.$$.log | egrep "DNS|Server host key|match:|Connecting to|Connection|Authenticating to"'
 
 elif [ "$1" = hostname ]
 then
-- 
cgit v1.2.3