[Pkg-sssd-devel] sssd: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog            |   10 ++++++++++
 debian/libsss-sudo.postinst |   22 ++++------------------
 debian/libsss-sudo.postrm   |    5 +++++
 3 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 11dfbea92c956c300d0fc661333ab3ccd3b64a9e
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 16 14:32:53 2015 +0200

    releasing package sssd version 1.11.7-3

diff --git a/debian/changelog b/debian/changelog
index 582880e..ae7ce3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sssd (1.11.7-3) UNRELEASED; urgency=medium
+sssd (1.11.7-3) unstable; urgency=medium
 
   * libsss-sudo.postrm: Delete sudoers line from nsswitch.conf, if only
     files source left. (Closes: #749722)
@@ -6,7 +6,7 @@ sssd (1.11.7-3) UNRELEASED; urgency=medium
   * libsss-sudo.postinst: Check nsswitch sudoers entry unconditionally,
     so that it is added on upgrade too if missing.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Nov 2014 15:59:43 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 16 Jan 2015 13:53:22 +0200
 
 sssd (1.11.7-2) unstable; urgency=medium
 

commit 85890f61a25590f2ade8f6f03e3e93f563a4c7d5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Nov 28 09:34:27 2014 +0200

    libsss-sudo.postinst: Check nsswitch sudoers entry unconditionally, so that it is added on upgrade too if missing.

diff --git a/debian/changelog b/debian/changelog
index 7e5cab1..582880e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ sssd (1.11.7-3) UNRELEASED; urgency=medium
   * libsss-sudo.postrm: Delete sudoers line from nsswitch.conf, if only
     files source left. (Closes: #749722)
   * libsss-sudo.postinst: Fix comments.
+  * libsss-sudo.postinst: Check nsswitch sudoers entry unconditionally,
+    so that it is added on upgrade too if missing.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Nov 2014 15:59:43 +0200
 
diff --git a/debian/libsss-sudo.postinst b/debian/libsss-sudo.postinst
index cdc5cc1..1cd9ff2 100644
--- a/debian/libsss-sudo.postinst
+++ b/debian/libsss-sudo.postinst
@@ -47,20 +47,7 @@ insert_nss_entry() {
     fi
 }
 
-action="$1"
+insert_nss_entry
 
-if [ configure = "$action" ]; then
-    if [ -z "$2" ]; then
-        log "First installation detected..."
-        # first install: setup the recommended configuration (unless
-        # nsswitch.conf already contains sss entries)
-        insert_nss_entry
-    else
-        # upgrade
-        version="$2"
-
-        # Nothing to do here yet
-    fi
-fi
 
 exit 0

commit 817abc6751f03f4cf80456aafaeb21b10ad3b566
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Nov 27 16:54:38 2014 +0200

    libsss-sudo.postinst: Fix comments.

diff --git a/debian/changelog b/debian/changelog
index 78a8086..7e5cab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sssd (1.11.7-3) UNRELEASED; urgency=medium
 
   * libsss-sudo.postrm: Delete sudoers line from nsswitch.conf, if only
     files source left. (Closes: #749722)
+  * libsss-sudo.postinst: Fix comments.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Nov 2014 15:59:43 +0200
 
diff --git a/debian/libsss-sudo.postinst b/debian/libsss-sudo.postinst
index 298c758..cdc5cc1 100644
--- a/debian/libsss-sudo.postinst
+++ b/debian/libsss-sudo.postinst
@@ -24,10 +24,9 @@ log() {
     echo "$*"
 }
 
-# try to insert sss entries to the passwd, group, shadow and netgroup
-# lines in /etc/nsswitch.conf to automatically enable libnss-sss
-# support; do not change the configuration if the lines already
-# references some sss lookups
+# try to insert sss entries to the sudoers line in /etc/nsswitch.conf to
+# automatically enable libsss-sudo support; do not change the configuration
+# if the lines already references some sss lookups
 insert_nss_entry() {
     log "Checking NSS setup..."
     # abort if /etc/nsswitch.conf does not exist

commit 324b08f0109045128bd1e573f182243e87b1dc36
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Nov 27 16:03:11 2014 +0200

    libsss-sudo.postrm: Delete sudoers line from nsswitch.conf, if only files source left. (Closes: #749722)

diff --git a/debian/changelog b/debian/changelog
index 18d8788..78a8086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sssd (1.11.7-3) UNRELEASED; urgency=medium
+
+  * libsss-sudo.postrm: Delete sudoers line from nsswitch.conf, if only
+    files source left. (Closes: #749722)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Nov 2014 15:59:43 +0200
+
 sssd (1.11.7-2) unstable; urgency=medium
 
   * default, upstart.in: Upstream ticket #2312 is fixed now, so drop the
diff --git a/debian/libsss-sudo.postrm b/debian/libsss-sudo.postrm
index fbcf104..6817b47 100644
--- a/debian/libsss-sudo.postrm
+++ b/debian/libsss-sudo.postrm
@@ -22,6 +22,11 @@ remove_nss_entry() {
         s/[[:space:]]+$//
       }
     ' /etc/nsswitch.conf
+
+    # delete sudoers line if only default entry left"
+    if ! [ -z "grep \"^sudoers:        files$\" /etc/nsswitch.conf" ]; then
+        sed -i /^sudoers:/d /etc/nsswitch.conf
+    fi
 }
 
 case "$1" in