nsjail: don't restore console if nsjail runs in background
authorRobert Swiecki <robert@swiecki.net>
Thu, 3 Oct 2019 22:33:29 +0000 (00:33 +0200)
committerRobert Swiecki <robert@swiecki.net>
Thu, 3 Oct 2019 22:33:29 +0000 (00:33 +0200)
kafel
nsjail.cc

diff --git a/kafel b/kafel
index 722b93a630e53ca472a4c69f61cb3dfc44ea5041..8e69b8efae415cde3debffbb1e379d9e7a16835a 160000 (submodule)
--- a/kafel
+++ b/kafel
@@ -1 +1 @@
-Subproject commit 722b93a630e53ca472a4c69f61cb3dfc44ea5041
+Subproject commit 8e69b8efae415cde3debffbb1e379d9e7a16835a
index fd44155f04933a5fac2eca9f13acea77fa55bdb4..691f4dd54e62ca598bb98d7088b251cbee60cbc5 100644 (file)
--- a/nsjail.cc
+++ b/nsjail.cc
@@ -226,7 +226,9 @@ int main(int argc, char* argv[]) {
 
        sandbox::closePolicy(nsjconf.get());
        /* Try to restore the underlying console's params in case some program has changed it */
-       nsjail::setTC(STDIN_FILENO, trm.get());
+       if (!nsjconf->daemonize) {
+               nsjail::setTC(STDIN_FILENO, trm.get());
+       }
 
        LOG_D("Returning with %d", ret);
        return ret;