mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 08:13:04 +00:00
60e0187471
Commit d0c42dfa "pam: bind Linux-PAM locales from pam-specific folder
(upstream patch)" added autoreconfHook269 into one of the postPatch
phases.
This clobbered the change applied by `suid-wrapper-path.patch` as it was
patching Makefile.in.
As a result `nixosTests.sway` test started failing as:
check pass; user unknown
Running `swaylock` on real system exhibited the same result.
As `suid-wrapper-path.patch` is clobbered we were running non-suid
version of `unix_chkpwd`:
/nix/store/...-linux-pam-1.5.2/sbin/unix_chkpwd
instead of SUID-wrapped
/run/wrappers/bin/unix_chkpw
The fix is trivial: move the patch from auto-generated file to
`Makefile.am`.
Discovered-by: Yureka
7 lines
262 B
Diff
7 lines
262 B
Diff
It needs the SUID version during runtime, and that can't be in /nix/store/**
|
|
--- a/modules/pam_unix/Makefile.am
|
|
+++ b/modules/pam_unix/Makefile.am
|
|
@@ -21 +21 @@
|
|
- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \
|
|
+ -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \
|