[Pkg-sssd-devel] [Git][sssd-team/sssd][master] 3 commits: Fix sssd_be busy-looping when LDAP connection flickers. (Closes: #946847)

[Timo Aaltonen]

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


Commits:
8e5aa82d by Timo Aaltonen at 2020-02-27T21:07:12+02:00
Fix sssd_be busy-looping when LDAP connection flickers. (Closes: #946847)

- - - - -
882ccd06 by Timo Aaltonen at 2020-02-27T21:09:50+02:00
libnss-sss: Add an entry for automounter to nsswitch.conf. This is needed by ipa-client-automount.

- - - - -
008cd907 by Timo Aaltonen at 2020-02-27T21:10:28+02:00
Added gitlab-ci.yml.

- - - - -


6 changed files:

- debian/changelog
- + debian/gitlab-ci.yml
- debian/libnss-sss.postinst
- debian/libnss-sss.postrm
- + debian/patches/fix-946847.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+sssd (2.2.3-2) UNRELEASED; urgency=medium
+
+  * libnss-sss: Add an entry for automounter to nsswitch.conf. This is
+    needed by ipa-client-automount.
+  * Added gitlab-ci.yml.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Feb 2020 21:09:23 +0200
+
+sssd (2.2.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload with maintainer permission.
+  * Fix sssd_be busy-looping when LDAP connection flickers.
+    (Closes: #946847)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 21 Feb 2020 14:04:25 +0100
+
 sssd (2.2.3-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/gitlab-ci.yml
=====================================
@@ -0,0 +1,3 @@
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/libnss-sss.postinst
=====================================
@@ -22,10 +22,15 @@ insert_nss_entry() {
     fi
     # append 'sss' to the end of the line if it's not found already
     sed -i --regexp-extended '
-      /^(passwd|group|shadow|netgroup|services):/ {
+      /^(passwd|group|shadow|netgroup|services|automounter):/ {
         /\bsss\b/! s/$/ sss/
       }
     ' /etc/nsswitch.conf
+    # and add a new entry for automount if it's not there
+    if ! grep -q automounter /etc/nsswitch.conf; then
+        log "Adding an entry for automounter."
+        echo "automounter:    sss" >> /etc/nsswitch.conf
+    fi
 }
 
 action="$1"


=====================================
debian/libnss-sss.postrm
=====================================
@@ -22,6 +22,7 @@ remove_nss_entry() {
         s/[[:space:]]+$//
       }
     ' /etc/nsswitch.conf
+    sed -i '/^automounter/d' /etc/nsswitch.conf
 }
 
 case "$1" in


=====================================
debian/patches/fix-946847.diff
=====================================
@@ -0,0 +1,36 @@
+Description: fix busy loop caused by watchdog SIGTERM not processed
+Origin: https://pagure.io/SSSD/sssd/c/2c13d8b
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946847
+Bug: https://pagure.io/SSSD/sssd/issue/4132
+Bug: https://pagure.io/SSSD/sssd/issue/4089
+Forwarded: not-needed
+Author: Alexey Tikhonov
+Reviewed-by: Sumit Bose <sbose at redhat.com>
+Reviewed-by: mirabilos <tg at debian.org>
+Applied-Upstream: 2.2.4, commit:2c13d8b
+Applied-Upstream: 1.16.5, commit:0c62066
+
+--- a/src/util/util_watchdog.c
++++ b/src/util/util_watchdog.c
+@@ -54,9 +54,8 @@ static void watchdog_detect_timeshift(vo
+         if (write(watchdog_ctx.pipefd[1], "1", 1) != 1) {
+             if (getpid() == getpgrp()) {
+                 kill(-getpgrp(), SIGTERM);
+-            } else {
+-                _exit(1);
+             }
++            _exit(1);
+         }
+     }
+ }
+@@ -75,9 +74,8 @@ static void watchdog_handler(int sig)
+     if (__sync_add_and_fetch(&watchdog_ctx.ticks, 1) > WATCHDOG_MAX_TICKS) {
+         if (getpid() == getpgrp()) {
+             kill(-getpgrp(), SIGTERM);
+-        } else {
+-            _exit(1);
+         }
++        _exit(1);
+     }
+ }
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 fix-whitespace-test.diff
 default-to-socket-activated-services.diff
+fix-946847.diff



View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/5db8609f6e3991388fdc89aa8a3e4eda34097b23...008cd9074a96c7ed4ce83022b6884010ec55bf07

-- 
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/5db8609f6e3991388fdc89aa8a3e4eda34097b23...008cd9074a96c7ed4ce83022b6884010ec55bf07
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/20200227/1d22cb3a/attachment-0001.html>