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 6ec84120c8d4d570116b0d764f10e287cad63280..d7acb3f60094b3a594f1c7fcba34ba83d8e012c5 100644 (file)
--- 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 57cdb5290d9f9949edcb8f9cffcce3960e973626..7236aebc0a01eb19f2a4aade69e950c6c3f6cc48 100644 (file)
--- 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 63238e557c5bea2559f13252c95630eab72289ce..f78693450e630f41d84ad766f68d0d13e36f1c83 100644 (file)
--- 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 ce62b7154fe9d03f475c49297c2dd43faab964e2..c12592cda83d2a2763bbf7fbac53a1b76c23c356 100644 (file)
--- 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 2c1ae3050ddc3a5ebdef2b137998ab599b302f56..b53aa0f9fae067f732b93f17a041acb2deca19fe 100644 (file)
--- 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__ */