changeset 4578:3bb3d5ad254f HEAD

Cleanup + handle dup() failure.
author Timo Sirainen <tss@iki.fi>
date Thu, 17 Aug 2006 21:17:38 +0300
parents afbe8e85e5d6
children 40b353def38c
files src/master/main.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/main.c	Thu Aug 17 20:43:58 2006 +0300
+++ b/src/master/main.c	Thu Aug 17 21:17:38 2006 +0300
@@ -426,8 +426,8 @@
 			if (*fd == -1)
 				i_fatal("listen(%d) failed: %m", port);
 			net_set_nonblock(*fd, TRUE);
+			fd_close_on_exec(*fd, TRUE);
 		}
-		fd_close_on_exec(*fd, TRUE);
 	}
 
 	if (set->listen_fd == -1)
@@ -508,6 +508,8 @@
 	/* make sure all fds between 0..3 are used. */
 	while (null_fd < 4) {
 		null_fd = dup(null_fd);
+		if (null_fd == -1)
+			i_fatal("dup(null_fd) failed: %m");
 		fd_close_on_exec(null_fd, TRUE);
 	}