From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 5 Mar 2008 00:28:36 +0000 (+0000)
Subject: Merge changes from CUPS 1.4svn-r7370.
X-Git-Tag: release-1.6.3~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64a69576c8ad175016b00e96940da35a82e769c2;p=thirdparty%2Fcups.git

Merge changes from CUPS 1.4svn-r7370.


git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@659 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-1.3.txt b/CHANGES-1.3.txt
index 6ec84120c8..d7acb3f600 100644
--- a/CHANGES-1.3.txt
+++ b/CHANGES-1.3.txt
@@ -3,6 +3,7 @@ CHANGES-1.3.txt
 
 CHANGES IN CUPS V1.3.7
 
+	- The scheduler would crash if PAM was broken (STR #2734)
 	- The image filters did not work with some CMYK JPEG files
 	  produced by Adobe applications (STR #2727)
 	- The Mac OS X USB backend did not work with printers that
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 57cdb5290d..7236aebc0a 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -239,7 +239,7 @@ case $uname in
 		FONTS=""
 		LEGACY_BACKENDS=""
                 BACKLIBS="$BACKLIBS -framework IOKit"
-                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -framework ApplicationServices"
+                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -weak_framework ApplicationServices"
                 LIBS="-framework SystemConfiguration -framework CoreFoundation $LIBS"
 
 		dnl Check for framework headers...
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index 63238e557c..f78693450e 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -1336,21 +1336,6 @@ PPD file extensions was used. Currently it must be the string
 
 <h2 class='title'><a name='MACOSX'>Mac OS X Attributes</a></h2>
 
-<h3><a name='APBookFile'>APBookFile</a></h3>
-
-<p class='summary'>*APBookFile: "file URL"</p>
-
-<p>This string attribute specifies the Apple help book file to use when
-looking up IPP reason codes for this printer driver. The
-<a href='#cupsIPPReason'><tt>cupsIPPReason</tt></a> attribute maps
-"help" URIs to this file.</p>
-
-<p>Example:</p>
-
-<pre class='command'>
-*APBookFile: "file:///Library/Printers/vendor/Help/filename"
-</pre>
-
 <h3><span class='info'>Mac OS X 10.3</span><a name='APDialogExtension'>APDialogExtension</a></h3>
 
 <p class='summary'>*APDialogExtension: "/Library/Printers/vendor/filename.plugin"</p>
@@ -1459,6 +1444,21 @@ and the <tt>Tumble</tt> page attribute.</p>
 <p>Also see the related <a href='#cupsBackSide'><tt>cupsBackSide</tt></a>
 attribute.</p>
 
+<h3><a name='APHelpBook'>APHelpBook</a></h3>
+
+<p class='summary'>*APHelpBook: "file URL"</p>
+
+<p>This string attribute specifies the Apple help book file to use when
+looking up IPP reason codes for this printer driver. The
+<a href='#cupsIPPReason'><tt>cupsIPPReason</tt></a> attribute maps
+"help" URIs to this file.</p>
+
+<p>Example:</p>
+
+<pre class='command'>
+*APHelpBook: "file:///Library/Printers/vendor/Help/filename"
+</pre>
+
 <h3><span class='info'>Mac OS X 10.3</span><a name='APPrinterIconPath'>APPrinterIconPath</a></h3>
 
 <p class='summary'>*APPrinterIconPath: "/Library/Printers/vendor/filename"</p>
diff --git a/scheduler/auth.c b/scheduler/auth.c
index ce62b7154f..c12592cda8 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -662,7 +662,6 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 	      cupsdLogMessage(CUPSD_LOG_ERROR,
 	                      "cupsdAuthorize: pam_start() returned %d (%s)!\n",
         	              pamerr, pam_strerror(pamh, pamerr));
-	      pam_end(pamh, 0);
 	      return;
 	    }
 
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 2c1ae3050d..b53aa0f9fa 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -2923,6 +2923,13 @@ apple_register_profiles(
   cups_array_t		*languages;	/* Languages array */
 
 
+ /*
+  * Make sure ColorSync is available...
+  */
+
+  if (CMRegisterColorDevice == NULL)
+    return;
+
  /*
   * Try opening the PPD file for this printer...
   */
@@ -3164,7 +3171,12 @@ static void
 apple_unregister_profiles(
     cupsd_printer_t *p)			/* I - Printer */
 {
-  CMUnregisterColorDevice(cmPrinterDeviceClass, _ppdHashName(p->name));
+ /*
+  * Make sure ColorSync is available...
+  */
+
+  if (CMUnregisterColorDevice != NULL)
+    CMUnregisterColorDevice(cmPrinterDeviceClass, _ppdHashName(p->name));
 }
 #endif /* __APPLE__ */