attach: don't ignore sigint/sigkill if stdin is redirected

If attach is being done over passed-in fds, then we shouldn't mess with the caller's signal table to ignore ctrl-c over the fd. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

attach: don't ignore sigint/sigkill if stdin is redirected
62183f1a · Serge Hallyn · Stéphane Graber · 9eaf8a59 · 62183f1a
Commit 62183f1a authored Oct 29, 2014 by Serge Hallyn Committed by Stéphane Graber Oct 29, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

attach.c src/lxc/attach.c +4 -2

No files found.
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -758,8 +758,10 @@ int lxc_attach(const char* name, const char* lxcpath, lxc_attach_exec_t exec_fun
 		}
 		/* ignore SIGKILL (CTRL-C) and SIGQUIT (CTRL-\) - issue #313 */
-		signal(SIGINT, SIG_IGN);
+		if (options->stdin_fd == 0) {
-		signal(SIGQUIT, SIG_IGN);
+			signal(SIGINT, SIG_IGN);
+			signal(SIGQUIT, SIG_IGN);
+		}
 		/* reap intermediate process */
 		ret = wait_for_pid(pid);