From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 17 Jul 2013 01:07:00 +0000 (+0000)
Subject: The cups-exec helper program could fail randomly on OS X due to sandbox
X-Git-Tag: release-1.7.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=990c79d2787c244dbfb414f75b07963e18e663bd;p=thirdparty%2Fcups.git

The cups-exec helper program could fail randomly on OS X due to sandbox
violations when closing excess file descriptors (<rdar://problem/14421943>)

The scheduler incorrectly did not use the kqueue interface on OS X.



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11142 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 25640ec595..342483b981 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,13 @@
-CHANGES.txt - 1.7rc1 - 2013-07-10
----------------------------------
+CHANGES.txt - 1.7.0 - 2013-07-16
+--------------------------------
+
+CHANGES IN CUPS V1.7.0
+
+	- The cups-exec helper program could fail randomly on OS X due to
+	  sandbox violations when closing excess file descriptors
+	  (<rdar://problem/14421943>)
+	- The scheduler incorrectly did not use the kqueue interface on OS X.
+
 
 CHANGES IN CUPS V1.7rc1
 
diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c
index 1541a785f0..c90b648735 100644
--- a/scheduler/cups-exec.c
+++ b/scheduler/cups-exec.c
@@ -3,7 +3,7 @@
  *
  *   Sandbox helper for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -75,20 +75,6 @@ main(int  argc,				/* I - Number of command-line args */
   }
 #endif /* HAVE_SANDBOX_H */
 
- /*
-  * Close file descriptors we don't need (insurance):
-  *
-  * 0   = stdin
-  * 1   = stdout
-  * 2   = stderr
-  * 3   = back-channel
-  * 4   = side-channel
-  * 5-N = unused
-  */
-
-  for (i = 5; i < 1024; i ++)
-    close(i);
-
  /*
   * Execute the program...
   */
diff --git a/scheduler/select.c b/scheduler/select.c
index 44fa20b4c3..16061d95eb 100644
--- a/scheduler/select.c
+++ b/scheduler/select.c
@@ -3,7 +3,7 @@
  *
  *   Select abstraction functions for the CUPS scheduler.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -30,7 +30,6 @@
  */
 
 #include "cupsd.h"
-#undef HAVE_KQUEUE
 
 #ifdef HAVE_EPOLL
 #  include <sys/epoll.h>