Load cups into easysw/current.

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

3 files changed, 38 insertions, 7 deletions

diff --git a/scheduler/auth.c b/scheduler/auth.c
index ddc31ce6d..d0cee777f 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 6361 2007-03-19 16:01:28Z mike $"
+ * "$Id: auth.c 6397 2007-03-25 23:33:32Z mike $"
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
@@ -849,6 +849,21 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
     gss_name_t		client_name;	/* Client name */
 
 
+#  ifdef __APPLE__
+   /*
+    * If the weak-linked GSSAPI/Kerberos library is not present, don't try
+    * to use it...
+    */
+
+    if (gss_init_sec_context == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_WARN,
+                      "GSSAPI/Kerberos authentication failed because the "
+		      "Kerberos framework is not present.");
+      return;
+    }
+#  endif /* __APPLE__ */
+
     con->gss_output_token.length = 0;
 
    /*
@@ -2522,5 +2537,5 @@ to64(char          *s,			/* O - Output string */
 
 
 /*
- * End of "$Id: auth.c 6361 2007-03-19 16:01:28Z mike $".
+ * End of "$Id: auth.c 6397 2007-03-25 23:33:32Z mike $".
  */
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 186d14f3d..bb0645e45 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 6383 2007-03-21 20:01:20Z mike $"
+ * "$Id: ipp.c 6397 2007-03-25 23:33:32Z mike $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -7869,6 +7869,21 @@ save_krb5_creds(cupsd_client_t *con,	/* I - Client connection */
 		minor_status;		/* Minor status code */
 
 
+#  ifdef __APPLE__
+   /*
+    * If the weak-linked GSSAPI/Kerberos library is not present, don't try
+    * to use it...
+    */
+
+    if (krb5_init_context == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+		      "save_krb5_creds: GSSAPI/Kerberos framework is not "
+		      "present");
+      return;
+    }
+#  endif /* __APPLE__ */
+
  /*
   * Setup a cached context for the job filters to use...
   */
@@ -9458,5 +9473,5 @@ validate_user(cupsd_job_t    *job,	/* I - Job */
 
 
 /*
- * End of "$Id: ipp.c 6383 2007-03-21 20:01:20Z mike $".
+ * End of "$Id: ipp.c 6397 2007-03-25 23:33:32Z mike $".
  */
diff --git a/scheduler/job.c b/scheduler/job.c
index f18403c98..aa94e5b00 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 6376 2007-03-21 06:39:10Z mike $"
+ * "$Id: job.c 6399 2007-03-26 14:27:48Z mike $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -2934,7 +2934,8 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
   envp[envc ++] = printer_name;
 
   if (!printer->remote && !printer->raw &&
-      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
+      (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL &&
+      filter->dst)
   {
     snprintf(final_content_type, sizeof(final_content_type),
              "FINAL_CONTENT_TYPE=%s/%s",
@@ -3535,5 +3536,5 @@ update_job(cupsd_job_t *job)	/* I - Job to check */
 
 
 /*
- * End of "$Id: job.c 6376 2007-03-21 06:39:10Z mike $".
+ * End of "$Id: job.c 6399 2007-03-26 14:27:48Z mike $".
  */