#3 Move nss module earlier on hosts: line
Merged 2 years ago by agoode. Opened 2 years ago by zbyszek.
rpms/ zbyszek/nss-mdns adjust-nss-order  into  master

file modified
+10 -6
@@ -1,6 +1,6 @@ 

  Name: nss-mdns

  Version: 0.14.1

- Release: 8%{?dist}

+ Release: 9%{?dist}

  Summary: glibc plugin for .local name resolution

  

  License: LGPLv2+
@@ -44,11 +44,11 @@ 

  function mod_nss() {

      if [ -f "$1" ] ; then

          # sed-fu to add mdns4_minimal to the hosts line of /etc/nsswitch.conf

- 	    sed -i.bak '

- 		    /^hosts:/ !b

-     		/\<mdns\(4\|6\)\?\(_minimal\)\?\>/ b

-     		s/\([[:blank:]]\+\)dns\>/\1mdns4_minimal [NOTFOUND=return] dns/g

-     		' "$1"

+         sed -i.bak '

+                 /^hosts:/ !b

+             /\<mdns\(4\|6\)\?\(_minimal\)\?\>/ b

+             s/\<files\([[:blank:]]\+\)/files\1mdns4_minimal [NOTFOUND=return] /g

+             ' "$1"

      fi

  }

  
@@ -97,6 +97,10 @@ 

  

  

  %changelog

+ * Wed Sep  2 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.14.1-9

+ - Place 'mdns4_minimal' in /etc/nsswitch.conf after 'files' in /etc/nsswitch.conf,

+   so that it ends up before 'resolve' (#1867830)

+ 

  * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.1-8

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

Before the initroduction of nss-resolve, putting mdns before dns was equivalent
to putting it after files, since there wasn't anything inbetween. But when systemd
is installed first we get:
hosts: files resolve [!UNAVAIL=return] myhostname dns
which the existing scriptlet here would modify to:
hosts: files resolve [!UNAVAIL=return] myhostname mdns4_minimal [NOTFOUND=return] dns
but we really want:
hosts: files myhostname mdns4_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns
so mdns4 has higher priority than resolve.

This applies to F33 and rawhide.

Pull-Request has been merged by agoode

2 years ago