<rdar://problem/14040186> Backend failure when sharing Simulated inkjet after creatin...

Don't trampoline if we are using a password.

Don't call xpc_connection_suspend since we are releasing it (not supposed to do
that for some reason...)

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

diff --git a/CHANGES.txt b/CHANGES.txt
index a6e87ebf0a0333c1274d904d3370fa55b96a7013..002400e603dd87457c18dd5890914b8e0a2913fd 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,12 @@
-CHANGES.txt - 1.7b1 - 2013-05-13
---------------------------------
+CHANGES.txt - 1.7rc1 - 2013-06-05
+---------------------------------
 
-CHANGES IN CUPS V1.7b2
+CHANGES IN CUPS V1.7rc1
 
+       - Fixed some issues with conversion of PWG media size names to
+         hundredths of millimeters (<rdar://problem/14065748>)
+       - The IPP backend could crash on OS X when printing to a Kerberized
+         printer (<rdar://problem/14040186>)
        - The ipptool program now automatically extends timeouts when the
          output buffer is filled (<rdar://problem/14016099>)
        - The ipptool program now supports the --help and --version options.

diff --git a/backend/ipp.c b/backend/ipp.c
index e7f3c3f3e70d73ef5cef9abff3b76799a9e2eda9..7eec579468e8ed0ad1774c26f14a152ac4bfa811 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -366,7 +366,8 @@ main(int  argc,                             /* I - Number of command-line args */
   * that way.
   */
 
-  if (!getuid() && (value = getenv("AUTH_UID")) != NULL)
+  if (!getuid() && (value = getenv("AUTH_UID")) != NULL &&
+      !getenv("AUTH_PASSWORD"))
   {
     uid_t      uid = (uid_t)atoi(value);
                                        /* User ID */
@@ -3403,7 +3404,6 @@ run_as_user(char       *argv[],           /* I - Command-line arguments */
 
   if (conn)
   {
-    xpc_connection_suspend(conn);
     xpc_connection_cancel(conn);
     xpc_release(conn);
   }