summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-14 06:21:41 -0700
committerGitHub <noreply@github.com>2019-04-14 06:21:41 -0700
commiteed8bbf3f9e01d03203a199c04aa886835ffd9b5 (patch)
treed3140068a11b6d373224bddc3201aff672a63341 /pkg
parentf929b9e4d5a48f80810a7d0010951decbb38e47f (diff)
parent9e79530f8f1d2937e67fba27a33da3d368a5cf4e (diff)
downloadpodman-eed8bbf3f9e01d03203a199c04aa886835ffd9b5.tar.gz
podman-eed8bbf3f9e01d03203a199c04aa886835ffd9b5.tar.bz2
podman-eed8bbf3f9e01d03203a199c04aa886835ffd9b5.zip
Merge pull request #2927 from giuseppe/fix-tty-rootless
Revert "rootless: set controlling terminal for podman in the userns"
Diffstat (limited to 'pkg')
-rw-r--r--pkg/rootless/rootless_linux.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index d6a2793a7..9cb79ed4d 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -16,8 +16,6 @@
#include <sys/types.h>
#include <sys/prctl.h>
#include <dirent.h>
-#include <termios.h>
-#include <sys/ioctl.h>
static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
@@ -180,11 +178,6 @@ reexec_userns_join (int userns, int mountns)
_exit (EXIT_FAILURE);
}
- if (isatty (1) && ioctl (1, TIOCSCTTY, 0) == -1) {
- fprintf (stderr, "cannot ioctl(TIOCSCTTY): %s\n", strerror (errno));
- _exit (EXIT_FAILURE);
- }
-
if (setns (userns, 0) < 0)
{
fprintf (stderr, "cannot setns: %s\n", strerror (errno));