summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2019-02-13 20:40:59 +0000
committerSteve Langasek <steve.langasek@canonical.com>2019-02-13 20:41:19 +0000
commitc9763c3f9bf2260de33f179be164ec2d86334e59 (patch)
treee6a4f642440cc81e0060b8097ecaf2efd26bf266
parent113c6fa4ff6b13a3ce03187b5eab8be27932b42e (diff)
update xdm restart handling to cope with changes to what xdm writes to utmp
Bug-Debian: https://bugs.debian.org/922239
-rw-r--r--debian/changelog2
-rw-r--r--debian/libpam0g.postinst4
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d042825..242b038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pam (1.3.1-3) UNRELEASED; urgency=medium
* debian/control: drop redundant priority fields.
* Standards-Version 4.3.0.
* Restore lintian overrides for hardening false-positives.
+ * debian/libpam0g.postinst: update the xdm restart handling to cope with
+ changes to what xdm writes to utmp. Closes: #922239.
-- Steve Langasek <vorlon@debian.org> Wed, 13 Feb 2019 05:57:21 +0000
diff --git a/debian/libpam0g.postinst b/debian/libpam0g.postinst
index 5e0d63a..ed13344 100644
--- a/debian/libpam0g.postinst
+++ b/debian/libpam0g.postinst
@@ -105,7 +105,9 @@ then
check="$check sfs-server solid-pop3d squid squid3 tac-plus"
check="$check vsftpd wu-ftpd wzdftpd xrdp yardradius yaws"
- if ! who | awk '{print $2}'|grep -q ':[0-9]'; then
+ if [ -n "$(who | awk '$2 ~ /console/ && $NF ~ /:[0-9]/ { print $NF }
+ $2 ~ /:[0-9]/ { print $2 }')" ]
+ then
check="$check wdm xdm"
fi