Fix up rlimit crash and close crash.

1 files changed, 5 insertions, 9 deletions

diff --git a/mulderd.c b/mulderd.c
index 1985f40..ef31b54 100644
--- a/mulderd.c
+++ b/mulderd.c
@@ -27,7 +27,6 @@
 #include <sys/resource.h>
 #include <netinet/in.h>
 
-
 static char truth[] = "\033[32;1m\n\n"
 "                 _,--=--._\n"
 "               ,'    _    `.\n"
@@ -75,11 +74,6 @@ void drop_privileges()
 			exit(EXIT_FAILURE);
 		}
 	}
-	limit.rlim_cur = limit.rlim_max = 8192;
-	setrlimit(RLIMIT_DATA, &limit);
-	setrlimit(RLIMIT_MEMLOCK, &limit);
-	setrlimit(RLIMIT_AS, &limit);
-	setrlimit(RLIMIT_STACK, &limit);
 	limit.rlim_cur = limit.rlim_max = 0;
 	setrlimit(RLIMIT_CORE, &limit);
 	setrlimit(RLIMIT_NPROC, &limit);
@@ -197,10 +191,14 @@ int main(int argc, char *argv[])
 		}
 	}
 	if (daemonize) {
-		if (daemon(0, connection_log != 0) < 0) {
+		if (daemon(0, 1) < 0) {
 			perror("daemon");
 			return EXIT_FAILURE;
 		}
+		if (!connection_file) {
+			close(STDERR_FILENO);
+			close(STDOUT_FILENO);
+		}
 	}
 	if (pid_file) {
 		if (fprintf(pidfile, "%d\n", getpid()) < 0) {
@@ -211,9 +209,7 @@ int main(int argc, char *argv[])
 	}
 	
 	drop_privileges();
-
 	prctl(PR_SET_NAME, "truth beacon");
-	
 	timeout.tv_sec = 1;
 	timeout.tv_usec = 0;