Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 56 insertions, 25 deletions

diff --git a/upstream/debian-unstable/man5/org.freedesktop.resolve1.5 b/upstream/debian-unstable/man5/org.freedesktop.resolve1.5
index 4f3b397f..69b4a36e 100644
--- a/upstream/debian-unstable/man5/org.freedesktop.resolve1.5
+++ b/upstream/debian-unstable/man5/org.freedesktop.resolve1.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "ORG\&.FREEDESKTOP\&.RESOLVE1" "5" "" "systemd 255" "org.freedesktop.resolve1"
+.TH "ORG\&.FREEDESKTOP\&.RESOLVE1" "5" "" "systemd 256~rc3" "org.freedesktop.resolve1"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@ node /org/freedesktop/resolve1 {
       SetLinkDNSSECNegativeTrustAnchors(in  i ifindex,
                                         in  as names);
       RevertLink(in  i ifindex);
-      RegisterService(in  s name,
+      RegisterService(in  s id,
                       in  s name_template,
                       in  s type,
                       in  q service_port,
@@ -420,6 +420,32 @@ set) so that all settings take effect during the full time the network interface
 The
 \fBRevertLink()\fR
 method may be used to revert all per\-link settings described above to the defaults\&.
+.PP
+The
+\fBFlushCaches()\fR
+flushes all resource record caches maintained by the resolver, and ensures that any subsequent lookups re\-request their responses from their sources\&.
+.PP
+The
+\fBResetServerFeatures()\fR
+flushes any feature information learned about remote DNS servers\&. This ensures that subsequent lookups will be initially attempted at the highest DNS protocol feature level again, possibly requiring a (potentially slow) downgrade cycle to recognize the supported feature level again\&.
+.PP
+The
+\fBRegisterService()\fR
+method may be used to register a DNS\-SD service on the host\&. This functionality is closely related to the functionality provided by
+\fBsystemd.dnssd\fR(5)
+files\&. It takes a server identifier string as first parameter (this is just a local identifier, and should be chosen so that it neither collides with the basename of
+*\&.dnssd
+files nor with names chosen by other IPC clients)\&. It also takes a name template string for the DNS\-SD service name visible on the network\&. This string is subject to specifier expansation, as documented for the
+\fIName=\fR
+setting in
+*\&.dnssd
+files\&. It also takes a service type string containing the DNS\-SD service type, as well as an IP port, a priority/weight pair for the DNS\-SD SRV record\&. Finally, it takes an array of TXT record data\&. It returns an object path which may be used as handle to the registered service\&.
+.PP
+The
+\fBUnregisterService()\fR
+method undoes the effect of
+\fBRegisterService()\fR
+and deletes a DNS\-SD service previously created via IPC again\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
@@ -436,35 +462,36 @@ The four methods above accept and return a 64\-bit flags value\&. In most cases
 .\}
 .nf
 /* Input+Output: Protocol/scope */
-#define SD_RESOLVED_DNS               (UINT64_C(1) <<  0)
-#define SD_RESOLVED_LLMNR_IPV4        (UINT64_C(1) <<  1)
-#define SD_RESOLVED_LLMNR_IPV6        (UINT64_C(1) <<  2)
-#define SD_RESOLVED_MDNS_IPV4         (UINT64_C(1) <<  3)
-#define SD_RESOLVED_MDNS_IPV6         (UINT64_C(1) <<  4)
+#define SD_RESOLVED_DNS                (UINT64_C(1) <<  0)
+#define SD_RESOLVED_LLMNR_IPV4         (UINT64_C(1) <<  1)
+#define SD_RESOLVED_LLMNR_IPV6         (UINT64_C(1) <<  2)
+#define SD_RESOLVED_MDNS_IPV4          (UINT64_C(1) <<  3)
+#define SD_RESOLVED_MDNS_IPV6          (UINT64_C(1) <<  4)
 
 /* Input: Restrictions */
-#define SD_RESOLVED_NO_CNAME          (UINT64_C(1) <<  5)
-#define SD_RESOLVED_NO_TXT            (UINT64_C(1) <<  6)
-#define SD_RESOLVED_NO_ADDRESS        (UINT64_C(1) <<  7)
-#define SD_RESOLVED_NO_SEARCH         (UINT64_C(1) <<  8)
-#define SD_RESOLVED_NO_VALIDATE       (UINT64_C(1) << 10)
-#define SD_RESOLVED_NO_SYNTHESIZE     (UINT64_C(1) << 11)
-#define SD_RESOLVED_NO_CACHE          (UINT64_C(1) << 12)
-#define SD_RESOLVED_NO_ZONE           (UINT64_C(1) << 13)
-#define SD_RESOLVED_NO_TRUST_ANCHOR   (UINT64_C(1) << 14)
-#define SD_RESOLVED_NO_NETWORK        (UINT64_C(1) << 15)
-#define SD_RESOLVED_NO_STALE          (UINT64_C(1) << 24)
+#define SD_RESOLVED_NO_CNAME           (UINT64_C(1) <<  5)
+#define SD_RESOLVED_NO_TXT             (UINT64_C(1) <<  6)
+#define SD_RESOLVED_NO_ADDRESS         (UINT64_C(1) <<  7)
+#define SD_RESOLVED_NO_SEARCH          (UINT64_C(1) <<  8)
+#define SD_RESOLVED_NO_VALIDATE        (UINT64_C(1) << 10)
+#define SD_RESOLVED_NO_SYNTHESIZE      (UINT64_C(1) << 11)
+#define SD_RESOLVED_NO_CACHE           (UINT64_C(1) << 12)
+#define SD_RESOLVED_NO_ZONE            (UINT64_C(1) << 13)
+#define SD_RESOLVED_NO_TRUST_ANCHOR    (UINT64_C(1) << 14)
+#define SD_RESOLVED_NO_NETWORK         (UINT64_C(1) << 15)
+#define SD_RESOLVED_NO_STALE           (UINT64_C(1) << 24)
+#define SD_RESOLVED_RELAX_SINGLE_LABEL (UINT64_C(1) << 25)
 
 /* Output: Security */
-#define SD_RESOLVED_AUTHENTICATED     (UINT64_C(1) <<  9)
-#define SD_RESOLVED_CONFIDENTIAL      (UINT64_C(1) << 18)
+#define SD_RESOLVED_AUTHENTICATED      (UINT64_C(1) <<  9)
+#define SD_RESOLVED_CONFIDENTIAL       (UINT64_C(1) << 18)
 
 /* Output: Origin */
-#define SD_RESOLVED_SYNTHETIC         (UINT64_C(1) << 19)
-#define SD_RESOLVED_FROM_CACHE        (UINT64_C(1) << 20)
-#define SD_RESOLVED_FROM_ZONE         (UINT64_C(1) << 21)
-#define SD_RESOLVED_FROM_TRUST_ANCHOR (UINT64_C(1) << 22)
-#define SD_RESOLVED_FROM_NETWORK      (UINT64_C(1) << 23)
+#define SD_RESOLVED_SYNTHETIC          (UINT64_C(1) << 19)
+#define SD_RESOLVED_FROM_CACHE         (UINT64_C(1) << 20)
+#define SD_RESOLVED_FROM_ZONE          (UINT64_C(1) << 21)
+#define SD_RESOLVED_FROM_TRUST_ANCHOR  (UINT64_C(1) << 22)
+#define SD_RESOLVED_FROM_NETWORK       (UINT64_C(1) << 23)
 .fi
 .if n \{\
 .RE
@@ -646,6 +673,10 @@ property reports whether the stub listener on port 53 is enabled\&. Possible val
 (only the UDP listener is enabled), and
 "tcp"
 (only the TCP listener is enabled)\&.
+.PP
+The
+\fIDNSSECNegativeTrustAnchors\fR
+property contains a list of recognized DNSSEC negative trust anchors and contains a list of domains\&.
 .SH "LINK OBJECT"
 .sp
 .if n \{\