glib r6270 - in branches/glib-2-14: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Jan  8 01:08:22 2008
New Revision: 6270
URL: http://svn.gnome.org/viewvc/glib?rev=6270&view=rev

Log:
2008-01-06  Matthias Clasen  <mclasen redhat com>

        * glib/gspawn.c (fdwalk): Don't set open_max to
        RLIM_INFINITY.  (#495589, Tommi Komulainen)




Modified:
   branches/glib-2-14/ChangeLog
   branches/glib-2-14/glib/gspawn.c

Modified: branches/glib-2-14/glib/gspawn.c
==============================================================================
--- branches/glib-2-14/glib/gspawn.c	(original)
+++ branches/glib-2-14/glib/gspawn.c	Tue Jan  8 01:08:22 2008
@@ -936,7 +936,7 @@
   
 #ifdef HAVE_SYS_RESOURCE_H
       
-  if (getrlimit(RLIMIT_NOFILE, &rl) == 0)
+  if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
       open_max = rl.rlim_max;
   else
 #endif