Merge pull request #2589 from keszybz/resolve-tool-2

Better support of OPENPGPKEY, CAA, TLSA packets and tests

diff --cc Makefile.am
Simple merge

diff --cc man/systemd-resolve.xml
index 3779698be3b0315a031faca9665feaa1712e41a6,0defa2d7fbbb1b62dc90ebbab3e1a5cd39aadb22..802d9cbbe69e7a3ef2c95f7af32a87f67153a920
--- 1/man/systemd-resolve.xml
--- 2/man/systemd-resolve.xml
+++ b/man/systemd-resolve.xml
@@@ -114,8 -121,12 +121,12 @@@
      is assumed to be a domain name, that is already prefixed with an SRV type, and an SRV lookup is done (no
      TXT).</para>
  
+     <para>The <option>--openpgp</option> switch may be use to query PGP keys stored as the
+     <ulink url="https://tools.ietf.org/html/draft-wouters-dane-openpgp-02">OPENPGPKEY</ulink> resource records.
+     When this option is specified one or more e-mail address must be specified.</para>
+ 
      <para>The <option>--statistics</option> switch may be used to show resolver statistics, including information about
 -    the number of succesful and failed DNSSEC validations.</para>
 +    the number of successful and failed DNSSEC validations.</para>
  
      <para>The <option>--reset-statistics</option> may be used to reset various statistics counters maintained the
      resolver, including those shown in the <option>--statistics</option> output. This operation requires root

diff --cc src/basic/escape.c
Simple merge

diff --cc src/basic/escape.h
Simple merge

diff --cc src/basic/hexdecoct.c
Simple merge

diff --cc src/basic/util.h
Simple merge

diff --cc src/journal/fsprg.c
Simple merge

diff --cc src/journal/journal-authenticate.c
Simple merge

diff --cc src/journal/journal-file.c
Simple merge

diff --cc src/libsystemd-network/dhcp-option.c
Simple merge

diff --cc src/libsystemd-network/dhcp6-option.c
Simple merge

diff --cc src/libsystemd-network/test-dhcp-option.c
Simple merge

diff --cc src/libsystemd/sd-bus/bus-control.c
Simple merge

diff --cc src/libsystemd/sd-bus/bus-message.c
Simple merge

diff --cc src/libsystemd/sd-bus/bus-socket.c
Simple merge

diff --cc src/libsystemd/sd-resolve/sd-resolve.c
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/resolve/dns-type.h
Simple merge

diff --cc src/resolve/resolve-tool.c
Simple merge

diff --cc src/resolve/resolved-dns-dnssec.c
Simple merge

diff --cc src/resolve/resolved-dns-packet.c
Simple merge

diff --cc src/resolve/resolved-dns-rr.c
Simple merge

diff --cc src/resolve/resolved-dns-rr.h
Simple merge