Skip to content

CA-208547: Avoid races in pointing stdin/stdout/stderr at /dev/null #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2016
Merged

CA-208547: Avoid races in pointing stdin/stdout/stderr at /dev/null #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de5c38c
CA-208547: Avoid races in pointing stdin/stdout/stderr at /dev/null
johnelse Apr 22, 2016
50a2c3a
Stop using the xapi-project fork of the CI scripts
johnelse Apr 25, 2016
9f10c2d
Fix opam lint errors
johnelse Apr 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/ma
script: bash -ex .travis-opam.sh
sudo: true
env:
- OCAML_VERSION=4.02 PACKAGE=xapi-idl FORK_USER=xapi-project EXTRA_REMOTES=git://github.com/xapi-project/opam-repo-dev
- OCAML_VERSION=4.02 PACKAGE=xapi-idl EXTRA_REMOTES=git://github.com/xapi-project/opam-repo-dev
10 changes: 4 additions & 6 deletions lib/xcp_service.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,13 +554,11 @@ let daemonize ?start_fn () =
Unix.chdir "/";
mkdir_rec (Filename.dirname !pidfile) 0o755;
pidfile_write !pidfile;
Unix.close Unix.stdin;
Unix.close Unix.stdout;
Unix.close Unix.stderr;
let nullfd = Unix.openfile "/dev/null" [ Unix.O_RDWR ] 0 in
assert (nullfd = Unix.stdin);
let (_:Unix.file_descr) = Unix.dup nullfd in ();
let (_:Unix.file_descr) = Unix.dup nullfd in ();
Unix.dup2 nullfd Unix.stdin;
Unix.dup2 nullfd Unix.stdout;
Unix.dup2 nullfd Unix.stderr;
Unix.close nullfd
| _ -> exit 0)
| _ -> exit 0

Expand Down
10 changes: 8 additions & 2 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
opam-version: "1"
opam-version: "1.2"
authors: "Dave Scott"
homepage: "https://github.com/xapi-project/xcp-idl"
bug-reports: "https://github.com/xapi-project/xcp-idl/issues"
dev-repo: "git://github.com/xapi-project/xcp-idl"
maintainer: "dave.scott@eu.citrix.com"
build: [
[make "all"]
[make "install"]
]
build-test: [
[make "test"]
]
install: [
[make "install"]
]
remove: [
["ocamlfind" "remove" "xcp"]
]
Expand Down