From fc565c1b9d59a4a1b96d8ead859d3ea6f03a7d0e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 25 Aug 2019 23:42:31 -0400 Subject: [PATCH] nixos/update-users-groups.pl: chomp hashedPassword MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want any trailing whitespace, otherwise we mess up the formating of the shadow file. Some things like readFile may have the trailing new line. Fixes #66745 --- nixos/modules/config/update-users-groups.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index ef5e6346f02e..59cea51c611b 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -267,6 +267,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) { next if !defined $u; $hashedPassword = "!" if !$spec->{mutableUsers}; $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME + chomp $hashedPassword; push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n"; $shadowSeen{$name} = 1; }