Update to CUPS trunk r6695.

[thirdparty/cups.git] / scheduler / ipp.c

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index eb71f7c7bf7530ff1a1fded7872563ded8488b6e..ac24f6d4f05e6e96fa5fb70f1d9f3203ab940425 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 6678 2007-07-16 18:03:35Z mike $"
+ * "$Id: ipp.c 6689 2007-07-18 23:52:15Z mike $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -8274,8 +8274,13 @@ save_krb5_creds(cupsd_client_t *con,     /* I - Client connection */
     return;
   }
 
+ /*
+  * We MUST create a file-based cache because memory-based caches are
+  * only valid for the current process/address space.
+  */
+
 #  ifdef HAVE_KRB5_CC_RESOLVE
-  if (krb5_cc_resolve(krb_context, "MEMORY:", &ccache))
+  if (krb5_cc_resolve(krb_context, "FILE:", &ccache))
 #  elif defined(HAVE_HEIMDAL)
   if (krb5_cc_gen_new(krb_context, &krb5_fcc_ops, &ccache))
 #  else
@@ -8297,13 +8302,11 @@ save_krb5_creds(cupsd_client_t *con,    /* I - Client connection */
     return;
   }
 
-#ifdef HAVE_KRB5_CC_RESOLVE
-  cupsdSetStringf(&(job->ccname), "KRB5CCNAME=MEMORY:%s",
-                  krb5_cc_get_name(krb_context, ccache));
-#else
   cupsdSetStringf(&(job->ccname), "KRB5CCNAME=FILE:%s",
                   krb5_cc_get_name(krb_context, ccache));
-#endif /* HAVE_KRB5_CC_RESOLVE */
+
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] save_krb5_creds: %s", job->id,
+                  job->ccname);
 
   krb5_cc_close(krb_context, ccache);
 }
@@ -9869,5 +9872,5 @@ validate_user(cupsd_job_t    *job,        /* I - Job */
 
 
 /*
- * End of "$Id: ipp.c 6678 2007-07-16 18:03:35Z mike $".
+ * End of "$Id: ipp.c 6689 2007-07-18 23:52:15Z mike $".
  */