[dovecot-cvs] dovecot/src/lib restrict-process-size.c,1.3,1.4

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv17569/src/lib

Modified Files:
	restrict-process-size.c 
Log Message:
Don't try to set rlimits to infinity, rather just don't change them.



Index: restrict-process-size.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/restrict-process-size.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- restrict-process-size.c	1 Feb 2003 02:06:11 -0000	1.3
+++ restrict-process-size.c	8 Feb 2003 09:00:26 -0000	1.4
@@ -39,7 +39,8 @@
 #ifdef HAVE_RLIMIT_NPROC
 	rlim.rlim_max = rlim.rlim_cur =
 		max_processes < INT_MAX ? max_processes : RLIM_INFINITY;
-	if (setrlimit(RLIMIT_NPROC, &rlim) < 0)
+	if (rlim.rlim_cur != RLIM_INFINITY &&
+	    setrlimit(RLIMIT_NPROC, &rlim) < 0)
 		i_fatal("setrlimit(RLIMIT_NPROC, %u): %m", size);
 #endif
 
@@ -47,11 +48,13 @@
 		size > 0 && size < INT_MAX/1024/1024 ?
 		size*1024*1024 : RLIM_INFINITY;
 
-	if (setrlimit(RLIMIT_DATA, &rlim) < 0)
+	if (rlim.rlim_cur != RLIM_INFINITY &&
+	    setrlimit(RLIMIT_DATA, &rlim) < 0)
 		i_fatal("setrlimit(RLIMIT_DATA, %u): %m", size);
 
 #ifdef HAVE_RLIMIT_AS
-	if (setrlimit(RLIMIT_AS, &rlim) < 0)
+	if (rlim.rlim_cur != RLIM_INFINITY &&
+	    setrlimit(RLIMIT_AS, &rlim) < 0)
 		i_fatal("setrlimit(RLIMIT_AS, %u): %m", size);
 #endif
 #else