diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/local/pam-auth-update | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7512ec77..cb6ce6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ pam (1.1.8-4) UNRELEASED; urgency=medium soft nofile limit read from pid 1 to FD_SETSIZE. Thanks to Robie Basak <robie.basak@ubuntu.com> for the patch. Closes: #783105. * Acknowledge security NMU. + * pam-auth-update: don't mishandle trailing whitespace in profiles. + LP: #1487103. -- Steve Langasek <vorlon@debian.org> Wed, 09 Apr 2014 14:04:10 -0700 diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update index 17d3fc66..60eb1e8f 100644 --- a/debian/local/pam-auth-update +++ b/debian/local/pam-auth-update @@ -671,7 +671,7 @@ sub parse_pam_profile my %profile; open(PROFILE, $profile) || die "could not read profile $profile: $!"; while (<PROFILE>) { - if (/^(\S+):\s+(.*)$/) { + if (/^(\S+):\s+(.*)\s*$/) { $fieldname = $1; # compatibility with the first implementation round; # "Auth-Final" is now just called "Auth" @@ -686,6 +686,7 @@ sub parse_pam_profile } else { chomp; s/^\s+//; + s/\s+$//; $profile{$fieldname} .= "\n$_" if ($_); $profile{$fieldname} =~ s/^[\n\s]+//; } |