Merge pull request #2459 from brauner/2018-07-11/cleanup_makefile

src/lxc/Makefile.am

-pkginclude_HEADERS = \
-	attach_options.h \
+pkginclude_HEADERS = attach_options.h \
 		     lxccontainer.h \
 		     version.h
 
-noinst_HEADERS = \
-	attach.h \
-	storage/storage.h \
-	storage/btrfs.h \
-	storage/dir.h \
-	storage/loop.h \
-	storage/lvm.h \
-	storage/nbd.h \
-	storage/overlay.h \
-	storage/rbd.h \
-	storage/rsync.h \
-	storage/zfs.h \
-	storage/storage_utils.h \
-	tools/arguments.h \
+noinst_HEADERS = attach.h \
+		 caps.h \
 		 cgroups/cgroup.h \
 		 cgroups/cgroup_utils.h \
-	caps.h \
 		 conf.h \
 		 confile.h \
 		 confile_utils.h \
+		 criu.h \
 		 error.h \
 		 initutils.h \
 		 list.h \
@@ -33,16 +20,26 @@ noinst_HEADERS = \
 		 namespace.h \
 		 start.h \
 		 state.h \
+		 storage/btrfs.h \
+		 storage/dir.h \
+		 storage/loop.h \
+		 storage/lvm.h \
+		 storage/nbd.h \
+		 storage/overlay.h \
+		 storage/rbd.h \
+		 storage/rsync.h \
+		 storage/storage.h \
+		 storage/storage_utils.h \
+		 storage/zfs.h \
 		 terminal.h \
-	utils.h \
-	criu.h \
-	../tests/lxctest.h
+		 ../tests/lxctest.h \
+		 tools/arguments.h \
+		 utils.h
 
 if IS_BIONIC
-noinst_HEADERS += \
-	../include/ifaddrs.h \
-	../include/openpty.h \
-	../include/lxcmntent.h
+noinst_HEADERS += ../include/ifaddrs.h \
+		  ../include/lxcmntent.h \
+		  ../include/openpty.h
 endif
 
 if !HAVE_PRLIMIT
@@ -67,9 +64,9 @@ endif
 
 sodir=$(libdir)
 
-LSM_SOURCES = \
-	lsm/nop.c \
-	lsm/lsm.h lsm/lsm.c
+LSM_SOURCES = lsm/lsm.c \
+	      lsm/lsm.h \
+	      lsm/nop.c
 
 if ENABLE_APPARMOR
 LSM_SOURCES += lsm/apparmor.c
@@ -80,65 +77,63 @@ LSM_SOURCES += lsm/selinux.c
 endif
 
 lib_LTLIBRARIES = liblxc.la
-liblxc_la_SOURCES = \
-	storage/storage.c storage/storage.h \
-	storage/btrfs.c storage/btrfs.h \
-	storage/dir.c storage/dir.h \
-	storage/loop.c storage/loop.h \
-	storage/lvm.c storage/lvm.h \
-	storage/nbd.c storage/nbd.h \
-	storage/overlay.c storage/overlay.h \
-	storage/rbd.c storage/rbd.h \
-	storage/rsync.c storage/rsync.h \
-	storage/zfs.c storage/zfs.h \
-	storage/storage_utils.c storage/storage_utils.h \
+liblxc_la_SOURCES = af_unix.c af_unix.h \
+		    attach.c attach.h \
+		    caps.c caps.h \
 		    cgroups/cgfsng.c \
-	cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
 		    cgroups/cgroup.c cgroups/cgroup.h \
+		    cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
 		    commands.c commands.h \
 		    commands_utils.c commands_utils.h \
-	start.c start.h \
-	execute.c \
-	monitor.c monitor.h \
-	terminal.c \
-	freezer.c \
-	error.h error.c \
-	parse.c parse.h \
-	lxc.h \
-	initutils.c initutils.h \
-	utils.c utils.h \
-	sync.c sync.h \
-	namespace.h namespace.c \
 		    conf.c conf.h \
 		    confile.c confile.h \
 		    confile_utils.c confile_utils.h \
+		    criu.c criu.h \
+		    error.c error.h \
+		    execute.c \
+		    freezer.c \
+		    initutils.c initutils.h \
 		    list.h \
-	state.c state.h \
 		    log.c log.h \
-	attach.c attach.h \
-	criu.c criu.h \
-	ringbuf.c ringbuf.h \
-	\
-	network.c network.h \
-	nl.c nl.h \
-	rtnl.c rtnl.h \
-	\
-	caps.c caps.h \
+		    lxc.h \
+		    lxccontainer.c lxccontainer.h \
+		    lxclock.c lxclock.h \
 		    lxcseccomp.h \
 		    mainloop.c mainloop.h \
-	af_unix.c af_unix.h \
-	\
-	lxclock.h lxclock.c \
-	lxccontainer.c lxccontainer.h \
+		    namespace.c namespace.h \
+		    nl.c nl.h \
+		    network.c network.h \
+		    monitor.c monitor.h \
+		    parse.c parse.h \
+		    ringbuf.c ringbuf.h \
+		    rtnl.c rtnl.h \
+		    state.c state.h \
+		    start.c start.h \
+		    storage/btrfs.c storage/btrfs.h \
+		    storage/dir.c storage/dir.h \
+		    storage/loop.c storage/loop.h \
+		    storage/lvm.c storage/lvm.h \
+		    storage/nbd.c storage/nbd.h \
+		    storage/overlay.c storage/overlay.h \
+		    storage/rbd.c storage/rbd.h \
+		    storage/rsync.c storage/rsync.h \
+		    storage/storage.c storage/storage.h \
+		    storage/storage_utils.c storage/storage_utils.h \
+		    storage/zfs.c storage/zfs.h \
+		    sync.c sync.h \
+		    terminal.c \
+		    utils.c utils.h \
 		    version.h \
-	\
 		    $(LSM_SOURCES)
 
 if IS_BIONIC
-liblxc_la_SOURCES += \
-	../include/ifaddrs.c ../include/ifaddrs.h \
-	../include/openpty.c ../include/openpty.h \
-	../include/lxcmntent.c ../include/lxcmntent.h
+liblxc_la_SOURCES += ../include/ifaddrs.c ../include/ifaddrs.h \
+		     ../include/lxcmntent.c ../include/lxcmntent.h \
+		     ../include/openpty.c ../include/openpty.h
+endif
+
+if !HAVE_GETGRGID_R
+liblxc_la_SOURCES += ../include/getgrgid_r.c ../include/getgrgid_r.h
 endif
 
 if !HAVE_GETLINE
@@ -165,11 +160,7 @@ if !HAVE_STRLCAT
 liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h
 endif
 
-if !HAVE_GETGRGID_R
-liblxc_la_SOURCES += ../include/getgrgid_r.c ../include/getgrgid_r.h
-endif
-
-AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
+AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
 	    -DLXCPATH=\"$(LXCPATH)\" \
 	    -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
 	    -DLXCINITDIR=\"$(LXCINITDIR)\" \
@@ -197,7 +188,8 @@ AM_CFLAGS += -DHAVE_LIBGNUTLS
 endif
 
 if ENABLE_SECCOMP
-AM_CFLAGS += -DHAVE_SECCOMP $(SECCOMP_CFLAGS)
+AM_CFLAGS += -DHAVE_SECCOMP \
+	     $(SECCOMP_CFLAGS)
 endif
 
 if ENABLE_SELINUX
@@ -231,8 +223,7 @@ bin_SCRIPTS += cmd/lxc-checkconfig \
 endif
 
 if ENABLE_TOOLS
-bin_PROGRAMS = \
-	lxc-attach \
+bin_PROGRAMS = lxc-attach \
 	       lxc-autostart \
 	       lxc-cgroup \
 	       lxc-checkpoint \
@@ -259,47 +250,78 @@ endif
 
 if ENABLE_COMMANDS
 sbin_PROGRAMS = init.lxc
-pkglibexec_PROGRAMS = \
-	lxc-monitord \
+
+pkglibexec_PROGRAMS = lxc-monitord \
 		      lxc-user-nic
 endif
 
 AM_LDFLAGS = -Wl,-E
+
 if ENABLE_RPATH
 AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir)
 endif
-LDADD=liblxc.la @CAP_LIBS@ @GNUTLS_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@
+
+LDADD = liblxc.la \
+	@CAP_LIBS@ \
+	@GNUTLS_LIBS@ \
+	@SECCOMP_LIBS@ \
+	@SELINUX_LIBS@
 
 if ENABLE_TOOLS
-lxc_attach_SOURCES = tools/lxc_attach.c tools/arguments.c
-lxc_autostart_SOURCES = tools/lxc_autostart.c tools/arguments.c
-lxc_cgroup_SOURCES = tools/lxc_cgroup.c tools/arguments.c
-lxc_config_SOURCES = tools/lxc_config.c tools/arguments.c
-lxc_console_SOURCES = tools/lxc_console.c tools/arguments.c
-lxc_destroy_SOURCES = tools/lxc_destroy.c tools/arguments.c
-lxc_device_SOURCES = tools/lxc_device.c tools/arguments.c
-lxc_execute_SOURCES = tools/lxc_execute.c tools/arguments.c
-lxc_freeze_SOURCES = tools/lxc_freeze.c tools/arguments.c
-lxc_info_SOURCES = tools/lxc_info.c tools/arguments.c
-lxc_monitor_SOURCES = tools/lxc_monitor.c tools/arguments.c
-lxc_ls_SOURCES = tools/lxc_ls.c tools/arguments.c
-lxc_copy_SOURCES = tools/lxc_copy.c tools/arguments.c
-lxc_start_SOURCES = tools/lxc_start.c tools/arguments.c
-lxc_stop_SOURCES = tools/lxc_stop.c tools/arguments.c
-lxc_top_SOURCES = tools/lxc_top.c tools/arguments.c
-lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c tools/arguments.c
-lxc_unshare_SOURCES = tools/lxc_unshare.c tools/arguments.c
-lxc_wait_SOURCES = tools/lxc_wait.c tools/arguments.c
-lxc_create_SOURCES = tools/lxc_create.c tools/arguments.c
-lxc_snapshot_SOURCES = tools/lxc_snapshot.c tools/arguments.c
-lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c tools/arguments.c
+lxc_attach_SOURCES = tools/lxc_attach.c \
+		     tools/arguments.c tools/arguments.h
+lxc_autostart_SOURCES = tools/lxc_autostart.c \
+			tools/arguments.c tools/arguments.h
+lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
+		     tools/arguments.c tools/arguments.h
+lxc_config_SOURCES = tools/lxc_config.c \
+		     tools/arguments.c tools/arguments.h
+lxc_console_SOURCES = tools/lxc_console.c \
+		      tools/arguments.c tools/arguments.h
+lxc_destroy_SOURCES = tools/lxc_destroy.c \
+		      tools/arguments.c tools/arguments.h
+lxc_device_SOURCES = tools/lxc_device.c \
+		     tools/arguments.c tools/arguments.h
+lxc_execute_SOURCES = tools/lxc_execute.c \
+		      tools/arguments.c tools/arguments.h
+lxc_freeze_SOURCES = tools/lxc_freeze.c \
+		     tools/arguments.c tools/arguments.h
+lxc_info_SOURCES = tools/lxc_info.c \
+		   tools/arguments.c tools/arguments.h
+lxc_monitor_SOURCES = tools/lxc_monitor.c \
+		      tools/arguments.c tools/arguments.h
+lxc_ls_SOURCES = tools/lxc_ls.c \
+		 tools/arguments.c tools/arguments.h
+lxc_copy_SOURCES = tools/lxc_copy.c \
+		   tools/arguments.c tools/arguments.h
+lxc_start_SOURCES = tools/lxc_start.c \
+		    tools/arguments.c tools/arguments.h
+lxc_stop_SOURCES = tools/lxc_stop.c \
+		   tools/arguments.c tools/arguments.h
+lxc_top_SOURCES = tools/lxc_top.c \
+		  tools/arguments.c tools/arguments.h
+lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
+		       tools/arguments.c tools/arguments.h
+lxc_unshare_SOURCES = tools/lxc_unshare.c \
+		      tools/arguments.c tools/arguments.h
+lxc_wait_SOURCES = tools/lxc_wait.c \
+		   tools/arguments.c tools/arguments.h
+lxc_create_SOURCES = tools/lxc_create.c \
+		     tools/arguments.c tools/arguments.h
+lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
+		       tools/arguments.c tools/arguments.h
+lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
+			 tools/arguments.c tools/arguments.h
 endif
 
 if ENABLE_COMMANDS
 # Binaries shipping with liblxc
 init_lxc_SOURCES = cmd/lxc_init.c
 lxc_monitord_SOURCES = cmd/lxc_monitord.c
-lxc_user_nic_SOURCES = cmd/lxc_user_nic.c namespace.c network.c parse.c
+lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
+		       namespace.c namespace.h \
+		       network.c network.h \
+		       parse.c parse.h
 lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c
 endif
 
@@ -314,11 +336,17 @@ if ENABLE_COMMANDS
 if HAVE_STATIC_LIBCAP
 sbin_PROGRAMS += init.lxc.static
 
-init_lxc_static_SOURCES = cmd/lxc_init.c error.c log.c initutils.c caps.c parse.c namespace.c
+init_lxc_static_SOURCES = cmd/lxc_init.c \
+			  caps.c caps.h \
+			  error.c error.h \
+			  initutils.c initutils.h \
+			  log.c log.h \
+			  namespace.c namespace.h \
+			  parse.c parse.h
 
 if !HAVE_GETLINE
 if HAVE_FGETLN
-init_lxc_static_SOURCES += ../include/getline.c
+init_lxc_static_SOURCES += ../include/getline.c ../include/getline.h
 endif
 endif
 
@@ -339,10 +367,16 @@ endif
 if ENABLE_PAM
 if HAVE_PAM
 pam_LTLIBRARIES = pam_cgfs.la
-pam_cgfs_la_SOURCES = pam/pam_cgfs.c pam/utils.c pam/utils.h
+pam_cgfs_la_SOURCES = pam/pam_cgfs.c \
+		      pam/utils.c pam/utils.h
 pam_cgfs_la_CFLAGS = $(AM_CFLAGS)
-pam_cgfs_la_LIBADD = $(AM_LIBS) $(PAM_LIBS) -L$(top_srcdir)
-pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared
+pam_cgfs_la_LIBADD = $(AM_LIBS) \
+		     $(PAM_LIBS) \
+		     -L$(top_srcdir)
+pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \
+		      -avoid-version \
+		      -module \
+		      -shared
 endif
 endif
 

src/lxc/attach.c

@@ -448,12 +448,15 @@ static char *lxc_attach_getpwshell(uid_t uid)
 	int fd, ret;
 	pid_t pid;
 	int pipes[2];
-	char *result = NULL;
+	FILE *pipe_f;
+	bool found = false;
+	size_t line_bufsz = 0;
+	char *line = NULL, *result = NULL;
 
 	/* We need to fork off a process that runs the getent program, and we
 	 * need to capture its output, so we use a pipe for that purpose.
 	 */
-	ret = pipe(pipes);
+	ret = pipe2(pipes, O_CLOEXEC);
 	if (ret < 0)
 		return NULL;
 
@@ -464,12 +467,45 @@ static char *lxc_attach_getpwshell(uid_t uid)
 		return NULL;
 	}
 
-	if (pid) {
-		int status;
-		FILE *pipe_f;
-		int found = 0;
-		size_t line_bufsz = 0;
-		char *line = NULL;
+	if (!pid) {
+		char uid_buf[32];
+		char *arguments[] = {
+			"getent",
+			"passwd",
+			uid_buf,
+			NULL
+		};
+
+		close(pipes[0]);
+
+		/* We want to capture stdout. */
+		ret = dup2(pipes[1], STDOUT_FILENO);
+		close(pipes[1]);
+		if (ret < 0)
+			exit(EXIT_FAILURE);
+
+		/* Get rid of stdin/stderr, so we try to associate it with
+		 * /dev/null.
+		 */
+		fd = open_devnull();
+		if (fd < 0) {
+			close(STDIN_FILENO);
+			close(STDERR_FILENO);
+		} else {
+			(void)dup3(fd, STDIN_FILENO, O_CLOEXEC);
+			(void)dup3(fd, STDOUT_FILENO, O_CLOEXEC);
+			close(fd);
+		}
+
+		/* Finish argument list. */
+		ret = snprintf(uid_buf, sizeof(uid_buf), "%ld", (long)uid);
+		if (ret <= 0 || ret >= sizeof(uid_buf))
+			exit(EXIT_FAILURE);
+
+		/* Try to run getent program. */
+		(void)execvp("getent", arguments);
+		exit(EXIT_FAILURE);
+	}
 
 	close(pipes[1]);
 
@@ -495,23 +531,28 @@ static char *lxc_attach_getpwshell(uid_t uid)
 		token = strtok_r(line, ":", &saveptr);
 		if (!token)
 			continue;
+
 		/* next: dummy password field */
 		token = strtok_r(NULL, ":", &saveptr);
 		if (!token)
 			continue;
+
 		/* next: user id */
 		token = strtok_r(NULL, ":", &saveptr);
 		value = token ? strtol(token, &endptr, 10) : 0;
-			if (!token || !endptr || *endptr || value == LONG_MIN || value == LONG_MAX)
+		if (!token || !endptr || *endptr || value == LONG_MIN ||
+				value == LONG_MAX)
 			continue;
+
 		/* dummy sanity check: user id matches */
-			if ((uid_t) value != uid)
+		if ((uid_t)value != uid)
 			continue;
+
 		/* skip fields: gid, gecos, dir, go to next field 'shell' */
 		for (i = 0; i < 4; i++) {
 			token = strtok_r(NULL, ":", &saveptr);
 			if (!token)
-					break;
+				continue;
 		}
 		if (!token)
 			continue;
@@ -523,30 +564,13 @@ static char *lxc_attach_getpwshell(uid_t uid)
 		if (token)
 			continue;
 
-			found = 1;
+		found = true;
 	}
-
 	free(line);
 	fclose(pipe_f);
-	again:
-		if (waitpid(pid, &status, 0) < 0) {
-			if (errno == EINTR)
-				goto again;
-			free(result);
-			return NULL;
-		}
-
-		/* Some sanity checks. If anything even hinted at going wrong,
-		 * we can't be sure we have a valid result, so we assume we
-		 * don't.
-		 */
 
-		if (!WIFEXITED(status)) {
-			free(result);
-			return NULL;
-		}
-
-		if (WEXITSTATUS(status) != 0) {
+	ret = wait_for_pid(pid);
+	if (ret < 0) {
 		free(result);
 		return NULL;
 	}
@@ -557,43 +581,6 @@ static char *lxc_attach_getpwshell(uid_t uid)
 	}
 
 	return result;
-	} else {
-		char uid_buf[32];
-		char *arguments[] = {
-			"getent",
-			"passwd",
-			uid_buf,
-			NULL
-		};
-
-		close(pipes[0]);
-
-		/* We want to capture stdout. */
-		dup2(pipes[1], 1);
-		close(pipes[1]);
-
-		/* Get rid of stdin/stderr, so we try to associate it with
-		 * /dev/null.
-		 */
-		fd = open("/dev/null", O_RDWR);
-		if (fd < 0) {
-			close(0);
-			close(2);
-		} else {
-			dup2(fd, 0);
-			dup2(fd, 2);
-			close(fd);
-		}
-
-		/* Finish argument list. */
-		ret = snprintf(uid_buf, sizeof(uid_buf), "%ld", (long) uid);
-		if (ret <= 0)
-			exit(-1);
-
-		/* Try to run getent program. */
-		(void) execvp("getent", arguments);
-		exit(-1);
-	}
 }
 
 static void lxc_attach_get_init_uidgid(uid_t *init_uid, gid_t *init_gid)
@@ -656,9 +643,10 @@ static void lxc_attach_get_init_uidgid(uid_t *init_uid, gid_t *init_gid)
 /* Define default options if no options are supplied by the user. */
 static lxc_attach_options_t attach_static_default_options = LXC_ATTACH_OPTIONS_DEFAULT;
 
-static bool fetch_seccomp(struct lxc_container *c,
-			  lxc_attach_options_t *options)
+static bool fetch_seccomp(struct lxc_container *c, lxc_attach_options_t *options)
 {
+	int ret;
+	bool bret;
 	char *path;
 
 	if (!(options->namespaces & CLONE_NEWNS) ||
@@ -669,62 +657,61 @@ static bool fetch_seccomp(struct lxc_container *c,
 	}
 
 	/* Remove current setting. */
-	if (!c->set_config_item(c, "lxc.seccomp", "") &&
-	    !c->set_config_item(c, "lxc.seccomp.profile", "")) {
+	if (!c->set_config_item(c, "lxc.seccomp.profile", "") &&
+	    !c->set_config_item(c, "lxc.seccomp", "")) {
 		return false;
 	}
 
 	/* Fetch the current profile path over the cmd interface. */
 	path = c->get_running_config_item(c, "lxc.seccomp.profile");
 	if (!path) {
-		INFO("Failed to get running config item for lxc.seccomp.profile");
+		INFO("Failed to retrieve lxc.seccomp.profile");
 		path = c->get_running_config_item(c, "lxc.seccomp");
-	}
 		if (!path) {
-		INFO("Failed to get running config item for lxc.seccomp");
+			INFO("Failed to retrieve lxc.seccomp");
 			return true;
 		}
+	}
 
 	/* Copy the value into the new lxc_conf. */
-	if (!c->set_config_item(c, "lxc.seccomp.profile", path)) {
+	bret = c->set_config_item(c, "lxc.seccomp.profile", path);
 	free(path);
+	if (!bret)
 		return false;
-	}
-	free(path);
 
 	/* Attempt to parse the resulting config. */
-	if (lxc_read_seccomp_config(c->lxc_conf) < 0) {
-		ERROR("Error reading seccomp policy.");
+	ret = lxc_read_seccomp_config(c->lxc_conf);
+	if (ret < 0) {
+		ERROR("Failed to retrieve seccomp policy");
 		return false;
 	}
 
-	INFO("Retrieved seccomp policy.");
+	INFO("Retrieved seccomp policy");
 	return true;
 }
 
 static bool no_new_privs(struct lxc_container *c, lxc_attach_options_t *options)
 {
+	bool bret;
 	char *val;
 
 	/* Remove current setting. */
-	if (!c->set_config_item(c, "lxc.no_new_privs", ""))
+	if (!c->set_config_item(c, "lxc.no_new_privs", "")) {
+		INFO("Failed to unset lxc.no_new_privs");
 		return false;
+	}
 
 	/* Retrieve currently active setting. */
 	val = c->get_running_config_item(c, "lxc.no_new_privs");
 	if (!val) {
-		INFO("Failed to get running config item for lxc.no_new_privs.");
+		INFO("Failed to retrieve lxc.no_new_privs");
 		return false;
 	}
 
 	/* Set currently active setting. */
-	if (!c->set_config_item(c, "lxc.no_new_privs", val)) {
-		free(val);
-		return false;
-	}
+	bret = c->set_config_item(c, "lxc.no_new_privs", val);
 	free(val);
-
-	return true;
+	return bret;
 }
 
 static signed long get_personality(const char *name, const char *lxcpath)
@@ -943,16 +930,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
 	 * here, ignore errors.
 	 */
 	for (fd = STDIN_FILENO; fd <= STDERR_FILENO; fd++) {
-		int flags;
-
-		flags = fcntl(fd, F_GETFL);
-		if (flags < 0)
-			continue;
-
-		if ((flags & FD_CLOEXEC) == 0)
-			continue;
-
-		ret = fcntl(fd, F_SETFL, flags & ~FD_CLOEXEC);
+		ret = fd_cloexec(fd, false);
 		if (ret < 0) {
 			SYSERROR("Failed to clear FD_CLOEXEC from file descriptor %d", fd);
 			goto on_error;
@@ -1086,7 +1064,7 @@ int lxc_attach(const char *name, const char *lxcpath,
 
 	init_pid = lxc_cmd_get_init_pid(name, lxcpath);
 	if (init_pid < 0) {
-		ERROR("Failed to get init pid.");
+		ERROR("Failed to get init pid");
 		return -1;
 	}
 
@@ -1120,10 +1098,10 @@ int lxc_attach(const char *name, const char *lxcpath,
 	conf = init_ctx->container->lxc_conf;
 
 	if (!fetch_seccomp(init_ctx->container, options))
-		WARN("Failed to get seccomp policy.");
+		WARN("Failed to get seccomp policy");
 
 	if (!no_new_privs(init_ctx->container, options))
-		WARN("Could not determine whether PR_SET_NO_NEW_PRIVS is set.");
+		WARN("Could not determine whether PR_SET_NO_NEW_PRIVS is set");
 
 	cwd = getcwd(NULL, 0);
 
@@ -1239,7 +1217,7 @@ int lxc_attach(const char *name, const char *lxcpath,
 	 */
 	ret = socketpair(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);
 	if (ret < 0) {
-		SYSERROR("Could not set up required IPC mechanism for attaching.");
+		SYSERROR("Could not set up required IPC mechanism for attaching");
 		free(cwd);
 		lxc_proc_put_context_info(init_ctx);
 		return -1;
@@ -1254,7 +1232,7 @@ int lxc_attach(const char *name, const char *lxcpath,
 	 */
 	pid = fork();
 	if (pid < 0) {
-		SYSERROR("Failed to create first subprocess.");
+		SYSERROR("Failed to create first subprocess");
 		free(cwd);
 		lxc_proc_put_context_info(init_ctx);
 		return -1;