all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 90a8b639f6ee0973933f36c314353370feb1940a 1879 bytes (raw)
name: gnu/packages/patches/change-path-to-unix_chkpwd.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
 
From f314ab148b488e23a2e48e7222964e46d0d03447 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Wed, 12 Jan 2022 17:17:42 +0300
Subject: [PATCH] Change path to unix_chkpwd.

---
 modules/pam_unix/pam_unix_acct.c | 4 ++--
 modules/pam_unix/support.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c
index 8f5ed3e0..2fdec6c7 100644
--- a/modules/pam_unix/pam_unix_acct.c
+++ b/modules/pam_unix/pam_unix_acct.c
@@ -122,12 +122,12 @@ int _unix_run_verify_binary(pam_handle_t *pamh, unsigned long long ctrl,
     }
 
     /* exec binary helper */
-    args[0] = CHKPWD_HELPER;
+    args[0] = "/run/setuid-programs/unix_chkpwd";
     args[1] = user;
     args[2] = "chkexpiry";
 
     DIAG_PUSH_IGNORE_CAST_QUAL;
-    execve(CHKPWD_HELPER, (char *const *) args, envp);
+    execve("/run/setuid-programs/unix_chkpwd", (char *const *) args, envp);
     DIAG_POP_IGNORE_CAST_QUAL;
 
     pam_syslog(pamh, LOG_ERR, "helper binary execve failed: %m");
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c
index 27ca7127..d02f394e 100644
--- a/modules/pam_unix/support.c
+++ b/modules/pam_unix/support.c
@@ -523,7 +523,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd,
 	}
 
 	/* exec binary helper */
-	args[0] = CHKPWD_HELPER;
+	args[0] = "/run/setuid-programs/unix_chkpwd";
 	args[1] = user;
 	if (off(UNIX__NONULL, ctrl)) {	/* this means we've succeeded */
 	  args[2]="nullok";
@@ -532,7 +532,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd,
 	}
 
 	DIAG_PUSH_IGNORE_CAST_QUAL;
-	execve(CHKPWD_HELPER, (char *const *) args, envp);
+	execve("/run/setuid-programs/unix_chkpwd", (char *const *) args, envp);
 	DIAG_POP_IGNORE_CAST_QUAL;
 
 	/* should not get here: exit with error */
-- 
2.34.0


debug log:

solving 90a8b639f6 ...
found 90a8b639f6 in https://yhetil.org/guix/87tudu38yz.fsf@trop.in/ ||
	https://yhetil.org/guix/87sftetuhg.fsf@trop.in/

applying [1/1] https://yhetil.org/guix/87tudu38yz.fsf@trop.in/
diff --git a/gnu/packages/patches/change-path-to-unix_chkpwd.patch b/gnu/packages/patches/change-path-to-unix_chkpwd.patch
new file mode 100644
index 0000000000..90a8b639f6

1:23: trailing whitespace.
 
1:29: trailing whitespace.
 
1:34: trailing whitespace.
 
1:41: space before tab in indent.
 	}
1:42: trailing whitespace.
 
Checking patch gnu/packages/patches/change-path-to-unix_chkpwd.patch...
Applied patch gnu/packages/patches/change-path-to-unix_chkpwd.patch cleanly.
warning: squelched 12 whitespace errors
warning: 17 lines add whitespace errors.

skipping https://yhetil.org/guix/87sftetuhg.fsf@trop.in/ for 90a8b639f6
index at:
100644 90a8b639f6ee0973933f36c314353370feb1940a	gnu/packages/patches/change-path-to-unix_chkpwd.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.