Rename variable diagnostic_comments to extra_comments because comment…

…s must always output (e.g. for DNSKEY).

Add sorting to match LDNS signzone zone file ordered output.

Moves per type comment output into impls of new trait `Commented`.

Cargo.toml

@@ -11,7 +11,7 @@ path = "src/bin/ldns.rs"
 [dependencies]
 bytes  = { version = "1.1", default-features = false }
 clap = { version = "4.3.4", features = ["cargo", "derive"] }
-domain = { git = "https://github.com/NLnetLabs/domain", branch = "multiple-key-signing", features = [
+domain = { git = "https://github.com/NLnetLabs/domain", branch = "support-zonefile-fmt-with-padding", features = [
     "bytes",
     "openssl",
     "ring",

src/commands/key2ds.rs

@@ -180,7 +180,7 @@ impl Key2ds {
             let rr = Record::new(owner, class, ttl, ds);
 
             if self.write_to_stdout {
-                writeln!(env.stdout(), "{}", rr.display_zonefile(false));
+                writeln!(env.stdout(), "{}", rr.display_zonefile(false, true));
             } else {
                 let owner = owner.fmt_with_dot();
                 let sec_alg = sec_alg.to_int();
@@ -210,7 +210,7 @@ impl Key2ds {
                 let mut out_file =
                     res.map_err(|e| format!("Could not create file \"{filename}\": {e}"))?;
 
-                writeln!(out_file, "{}", rr.display_zonefile(false))
+                writeln!(out_file, "{}", rr.display_zonefile(false, true))
                     .map_err(|e| format!("Could not write to file \"{filename}\": {e}"))?;
 
                 writeln!(env.stdout(), "{keyname}");