[Pkg-sssd-devel] [Git][sssd-team/sssd][master] 2 commits: Simplify logic to add "automount" database into nsswitch.

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at Debian SSSD packaging / sssd


Commits:
169d3688 by Sergio Durigan Junior at 2022-08-27T23:32:26-04:00
Simplify logic to add "automount" database into nsswitch.

- d/libnss-sss.nss: Add "automount database" directive.

- d/libnss-sss.postinst: Remove logic to insert "automount" database
  into nsswitch; not necessary anymore now that the package uses dh-nss.

- - - - -
8d497caa by Sergio Durigan Junior at 2022-08-27T23:34:18-04:00
changelog for 2.7.3-3

- - - - -


3 changed files:

- debian/changelog
- debian/libnss-sss.nss
- debian/libnss-sss.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
 sssd (2.7.3-3) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * control: Add bind9-dnsutils to sssd-common Recommends, and rename
     dnsutils build-dep. (Closes: #1018144)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Fri, 26 Aug 2022 09:46:25 +0300
+  [ Sergio Durigan Junior ]
+  * Simplify logic to add "automount" database into nsswitch.
+    - d/libnss-sss.nss: Add "automount database" directive.
+    - d/libnss-sss.postinst: Remove logic to insert "automount" database
+      into nsswitch; not necessary anymore now that the package uses dh-nss.
+
+ -- Sergio Durigan Junior <sergiodj at debian.org>  Sat, 27 Aug 2022 23:33:29 -0400
 
 sssd (2.7.3-2) unstable; urgency=medium
 


=====================================
debian/libnss-sss.nss
=====================================
@@ -1,3 +1,5 @@
+automount	database
+
 passwd	last	sss
 group	last	sss
 shadow	last	sss


=====================================
debian/libnss-sss.postinst
=====================================
@@ -1,34 +1,10 @@
 #!/bin/sh
 set -e
 
-log() {
-    echo "$*"
-}
-
-# Add the `automount` database to nsswitch.conf if it's not there.
-insert_nss_automount_db () {
-    log "Checking NSS setup..."
-    # abort if /etc/nsswitch.conf does not exist
-    if ! [ -e "${DPGK_ROOT}/etc/nsswitch.conf" ]; then
-        log "Could not find ${DPKG_ROOT}/etc/nsswitch.conf."
-        return
-    fi
-
-    # and add a new entry for automount if it's not there
-    if ! grep -q automount "${DPKG_ROOT}/etc/nsswitch.conf" ; then
-        log "Setting up empty automount NSS database"
-        echo "automount: " >> "${DPKG_ROOT}/etc/nsswitch.conf"
-    fi
-}
-
 action="$1"
 
 if [ configure = "$action" ]; then
-    if [ -z "$2" ]; then
-        log "First installation detected..."
-        # first install: setup automount NSS database.
-        insert_nss_automount_db
-    else
+    if [ -n "$2" ]; then
         # upgrade
         version="$2"
 



View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/860b0548d9c7e7e60a5998ec7309486b0c10a9ac...8d497caaf5e41a8170f2c20e66a91e79981af1fe

-- 
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/860b0548d9c7e7e60a5998ec7309486b0c10a9ac...8d497caaf5e41a8170f2c20e66a91e79981af1fe
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-sssd-devel/attachments/20220922/a00707db/attachment-0001.htm>