From: Timo Sirainen <tss@iki.fi>
Date: Sun, 27 Apr 2003 01:14:45 +0000 (+0300)
Subject: cleanup
X-Git-Tag: 1.1.alpha1~4709
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0bb6a113c3e5f6af18fbd1b53caa134d20481b8;p=thirdparty%2Fdovecot%2Fcore.git

cleanup

--HG--
branch : HEAD
---

diff --git a/src/lib/restrict-process-size.c b/src/lib/restrict-process-size.c
index bf2ba90245..f33679644e 100644
--- a/src/lib/restrict-process-size.c
+++ b/src/lib/restrict-process-size.c
@@ -37,26 +37,24 @@ void restrict_process_size(unsigned int size __attr_unused__,
 	struct rlimit rlim;
 
 #ifdef HAVE_RLIMIT_NPROC
-	rlim.rlim_max = rlim.rlim_cur =
-		max_processes < INT_MAX ? max_processes : RLIM_INFINITY;
-	if (rlim.rlim_cur != RLIM_INFINITY &&
-	    setrlimit(RLIMIT_NPROC, &rlim) < 0)
-		i_fatal("setrlimit(RLIMIT_NPROC, %u): %m", size);
+	if (max_processes < INT_MAX) {
+		rlim.rlim_max = rlim.rlim_cur = max_processes;
+		if (setrlimit(RLIMIT_NPROC, &rlim) < 0)
+			i_fatal("setrlimit(RLIMIT_NPROC, %u): %m", size);
+	}
 #endif
 
-	rlim.rlim_max = rlim.rlim_cur =
-		size > 0 && size < INT_MAX/1024/1024 ?
-		size*1024*1024 : RLIM_INFINITY;
+	if (size > 0 && size < INT_MAX/1024/1024) {
+		rlim.rlim_max = rlim.rlim_cur = size*1024*1024;
 
-	if (rlim.rlim_cur != RLIM_INFINITY &&
-	    setrlimit(RLIMIT_DATA, &rlim) < 0)
-		i_fatal("setrlimit(RLIMIT_DATA, %u): %m", size);
+		if (setrlimit(RLIMIT_DATA, &rlim) < 0)
+			i_fatal("setrlimit(RLIMIT_DATA, %u): %m", size);
 
 #ifdef HAVE_RLIMIT_AS
-	if (rlim.rlim_cur != RLIM_INFINITY &&
-	    setrlimit(RLIMIT_AS, &rlim) < 0)
-		i_fatal("setrlimit(RLIMIT_AS, %u): %m", size);
+		if (setrlimit(RLIMIT_AS, &rlim) < 0)
+			i_fatal("setrlimit(RLIMIT_AS, %u): %m", size);
 #endif
+	}
 #else
 	if (size != 0) {
 		i_warning("Can't restrict process size: "