Merge ~ahasenack/ubuntu/+source/sssd:bionic-sss-initial-install-only into ubuntu/+source/sssd:ubuntu/bionic-devel

Proposed by Andreas Hasenack on 2019-05-28
Status: Merged
Approved by: Andreas Hasenack on 2019-05-31
Approved revision: 686627d2a93b155f1454c99093b376d356204e96
Merged at revision: 686627d2a93b155f1454c99093b376d356204e96
Proposed branch: ~ahasenack/ubuntu/+source/sssd:bionic-sss-initial-install-only
Merge into: ubuntu/+source/sssd:ubuntu/bionic-devel
Diff against target: 30 lines (+10/-2)
2 files modified
debian/changelog (+7/-0)
debian/libsss-sudo.postinst (+3/-2)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  2019-05-28 Approve on 2019-05-30
Canonical Server Team 2019-05-30 Pending
Canonical Server packageset reviewers 2019-05-28 Pending
Review via email: mp+367989@code.launchpad.net

Description of the change

Cherry-picked the fix from debian, which is already available in cosmic and later.

Bug has the SRU template filled out, with simple testing instructions.

To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

yes to the change, yes to the changelog.
Seems small and helpful +1

review: Approve
Andreas Hasenack (ahasenack) wrote :

Thanks, tagged and uploaded.

$ git push pkg upload/1.16.1-1ubuntu1.3
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 2 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.15 KiB | 587.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/sssd
 * [new tag] upload/1.16.1-1ubuntu1.3 -> upload/1.16.1-1ubuntu1.3

$ dput ubuntu ../sssd_1.16.1-1ubuntu1.3_source.changes
Checking signature on .changes
gpg: ../sssd_1.16.1-1ubuntu1.3_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../sssd_1.16.1-1ubuntu1.3.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading sssd_1.16.1-1ubuntu1.3.dsc: done.
  Uploading sssd_1.16.1-1ubuntu1.3.diff.gz: done.
  Uploading sssd_1.16.1-1ubuntu1.3_source.buildinfo: done.
  Uploading sssd_1.16.1-1ubuntu1.3_source.changes: done.
Successfully uploaded packages.

Christian Ehrhardt  (paelzer) wrote :

FYI - Still waiting for SRU review in -unapproved

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 733371c..2e9b349 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+sssd (1.16.1-1ubuntu1.3) bionic; urgency=medium
7+
8+ * d/libsss-sudo.postinst: Add sss entry to nsswitch only on initial install.
9+ Thanks to Timo Aaltonen <tjaalton@debian.org> (LP: #1781991)
10+
11+ -- Andreas Hasenack <andreas@canonical.com> Tue, 28 May 2019 10:52:13 -0300
12+
13 sssd (1.16.1-1ubuntu1.2) bionic; urgency=medium
14
15 * d/p/GPO_CROND-customization.patch: Set GPO_CROND to cron instead of
16diff --git a/debian/libsss-sudo.postinst b/debian/libsss-sudo.postinst
17index 1cd9ff2..0f3d353 100644
18--- a/debian/libsss-sudo.postinst
19+++ b/debian/libsss-sudo.postinst
20@@ -47,7 +47,8 @@ insert_nss_entry() {
21 fi
22 }
23
24-insert_nss_entry
25-
26+if [ "$1" = configure ] && [ -z "$2" ]; then
27+ insert_nss_entry
28+fi
29
30 exit 0

Subscribers

People subscribed via source and target branches