diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 240020c19374..c6e0bee172e8 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1422,7 +1422,6 @@ let modulePath = config.security.pam.pam_unixModulePath; settings = { nullok = true; - yescrypt = lib.mkIf config.security.pam.enableLegacySettings true; }; } { diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index c6d5c9337e10..1b3705a2787a 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -577,7 +577,6 @@ in control = "requisite"; modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; settings.nullok = true; - settings.yescrypt = true; } ]; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 699a9a9a07f3..e1384e560e30 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -456,7 +456,6 @@ in control = "requisite"; modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; settings.nullok = true; - settings.yescrypt = true; } ]; diff --git a/nixos/tests/login-nosuid.nix b/nixos/tests/login-nosuid.nix index 1f00c37d0886..69d11803387f 100644 --- a/nixos/tests/login-nosuid.nix +++ b/nixos/tests/login-nosuid.nix @@ -49,6 +49,7 @@ with subtest("create user"): machine.succeed("useradd -m alice") machine.succeed("(echo foobar; echo foobar) | passwd alice") + machine.succeed("grep -F 'alice:$y$' /etc/shadow") with subtest("Check whether switching VTs works"): machine.fail("pgrep -f 'agetty.*tty2'") diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index bd0d3b7bc005..0eb0f8bf6ee3 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -28,6 +28,7 @@ with subtest("create user"): machine.succeed("useradd -m alice") machine.succeed("(echo foobar; echo foobar) | passwd alice") + machine.succeed("grep -F 'alice:$y$' /etc/shadow") with subtest("Check whether switching VTs works"): machine.fail("pgrep -f 'agetty.*tty2'")