rpms/shadow-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

vipw: restore the original terminal pgrp after editing

Browse Source 
Resolves: RHEL-93172

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa 2025-05-26 12:10:33 +02:00
parent aa026f4313
commit 5cf0fed2af
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
shadow-4.15.0-vipw-restore-terminal.patch Normal file
View File

@ -0,0 +1,41 @@
From 3b12ab7e29b0f3c766b39269da76a5ef3a753b22 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Thu, 23 Jan 2025 19:11:09 -0700
Subject: [PATCH] src/vipw.c: Restore the original terminal pgrp after editing
This fixes a problem when the shell is not in monitor mode (job control
enabled) which resulted in the terminal pgrp being set to an invalid
value once vipw exited.
Fixes: 7eca1112fbd7 (2019-11-11; "Fix vipw not resuming correctly when suspended")
Closes: <https://github.com/shadow-maint/shadow/issues/1194>
Reported-by: <https://github.com/yonecle>
Tested-by: Alejandro Colomar <alx@kernel.org>
Reviewed-by: Alejandro Colomar <alx@kernel.org>
---
src/vipw.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/vipw.c b/src/vipw.c
index a855e0d7..dbc87db9 100644
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -372,8 +372,14 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void))
}
}
- if (orig_pgrp != -1)
+ if (orig_pgrp != -1) {
+ /* Restore terminal pgrp after editing. */
+ if (tcsetpgrp(STDIN_FILENO, orig_pgrp) == -1) {
+ fprintf(stderr, "%s: %s: %s", Prog,
+ "tcsetpgrp", strerror(errno));
+ }
sigprocmask(SIG_SETMASK, &omask, NULL);
+ }
if (-1 == pid) {
vipwexit (editor, 1, 1);
--
2.49.0

7
shadow-utils.spec
View File

@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils
Version: 4.15.0
Release: 5%{?dist}
Release: 6%{?dist}
Epoch: 2
License: BSD-3-Clause AND GPL-2.0-or-later
URL: https://github.com/shadow-maint/shadow
@ -32,6 +32,8 @@ Patch4: shadow-4.15.0-account-tools-setuid.patch
Patch5: shadow-4.15.0-getdef-spurious-error.patch
# https://github.com/shadow-maint/shadow/commit/903593249630054ab5df327481f7386f718088cc
Patch6: shadow-4.15.0-useradd-fix-write-full-return.patch
# https://github.com/shadow-maint/shadow/commit/3b12ab7e29b0f3c766b39269da76a5ef3a753b22
Patch7: shadow-4.15.0-vipw-restore-terminal.patch
### Dependencies ###
Requires: audit-libs >= 1.6.5
@ -280,6 +282,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.a
%{_libdir}/libsubid.so
%changelog
* Mon May 26 2025 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.15.0-6
- vipw: restore the original terminal pgrp after editing. Resolves: RHEL-93172
* Mon Nov 4 2024 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.15.0-5
- Disable nscd. Resolves: RHEL-56355
- useradd: fix write_full() return value