2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-29 00:53:57 +00:00
nixpkgs/pkgs/development/libraries/libutempter/exec_path.patch
Artturin 1682b3d094 libutempter: 1.1.6 -> 1.2.1
refresh the patch to use utempter in path so patching the reverse
dependencies won't be needed anymore ('pkgs/tools/networking/mosh/utempter_path.patch')
2022-11-14 15:26:19 +02:00

33 lines
851 B
Diff

diff --git a/libutempter/iface.c b/libutempter/iface.c
index 37c74a8..6f44c9a 100644
--- a/libutempter/iface.c
+++ b/libutempter/iface.c
@@ -43,7 +43,7 @@
__result; }))
#endif
-#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter"
+#define UTEMPTER_DEFAULT_PATHNAME "utempter"
static const char *utempter_pathname;
static int saved_fd = -1;
@@ -57,8 +57,8 @@ do_child(int master_fd, const char *path, char *const *argv)
_exit(EXIT_FAILURE);
}
- execv(path, argv);
- print_dbg("execv: %s", strerror(errno));
+ execvp(path, argv);
+ print_dbg("execvp: %s", strerror(errno));
while (EACCES == errno) {
/* try saved group ID */
@@ -73,7 +73,7 @@ do_child(int master_fd, const char *path, char *const *argv)
if (setgid(sgid))
break;
- (void) execv(path, argv);
+ (void) execvp(path, argv);
break;
}