From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 5 Jun 2013 18:23:08 +0000 (+0000)
Subject: <rdar://problem/14040186> Backend failure when sharing Simulated inkjet after creatin... 
X-Git-Tag: release-1.7rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4aa2975847e4eb96891457933ac8a78293d14d9;p=thirdparty%2Fcups.git

<rdar://problem/14040186> Backend failure when sharing Simulated inkjet after creating ACL with standard user. OS X 10.9 (13A476l)

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 a6e87ebf0a..002400e603 100644
--- 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 e7f3c3f3e7..7eec579468 100644
--- 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);
   }