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: 7eca111 (2019-11-11; "Fix vipw not resuming correctly when suspended") Closes: <#1194> Reported-by: <https://github.com/yonecle> Tested-by: Alejandro Colomar <[email protected]> Reviewed-by: Alejandro Colomar <[email protected]>
shadow-maint · Jan 24, 2025 · 7dcb9a0 · 7dcb9a0
1 parent 76727c3
commit 7dcb9a0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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);