From 2e6e0d6e800281fb9aada34e0838ac7dcfd525f9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 23 Jan 2021 10:59:34 -0500 Subject: [PATCH] base-files: Restore mdns ordering in nsswitch.conf Placing mdns after dns in the host database resolution can cause unintuitive failures for users without nss-mdns or mDNSResponder. When looking up an invalid host, having order "dns mdns" will cause a dns "notfound" result to fall through to mdns, which will yield "unavailable" for users without an mdns provider. This causes clients like ssh to report "Device or resource busy" rather than a more meaningful message to indicate that the hostname is not valid. Flipping back to order "mdns dns" will case an "unavailable" mdns result to fall through to dns, which then returns "notfound" that clients interpret as expected. Because both mDNSResponder and nss-mdns offer a generic mdns provider. The mdns4 and mdns4_minimal providers offered by nss-mdns are subsets of the generic mdns provider, so there is no value in restoring the original "mdns mdns4_minimal mdns4" ordering (in fact, this may have caused failed mdns lookups to be repeated three times). All have been coalesced into the single mdns provider. This (partially) reverts commit cc11e17fab0d514f75a01aa79e44edb06f16bffe. --- srcpkgs/base-files/files/nsswitch.conf | 2 +- srcpkgs/base-files/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-files/files/nsswitch.conf b/srcpkgs/base-files/files/nsswitch.conf index be1d1e00f5c..f0355d90be4 100644 --- a/srcpkgs/base-files/files/nsswitch.conf +++ b/srcpkgs/base-files/files/nsswitch.conf @@ -6,7 +6,7 @@ passwd: files group: files shadow: files -hosts: files mdns_minimal [NOTFOUND=return] dns mdns +hosts: files mdns dns networks: files protocols: files diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index fff3ca5afbd..8040a801110 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,7 +1,7 @@ # Template file for 'base-files' pkgname=base-files version=0.141 -revision=6 +revision=7 bootstrap=yes depends="xbps-triggers" short_desc="Void Linux base system files"