Merge pull request #120 from johnelse/daemonize-fix-race

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

Author: johnelse

.travis.yml

@@ -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

lib/xcp_service.ml

@@ -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
 

opam

@@ -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"]
 ]