From 6d75f30ebfff9c80bec6c67ebbf69e38a323ec46 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 16 2023 06:17:45 +0000
Subject: import cups-2.2.6-51.el8


---

diff --git a/SOURCES/cups-kerberos.patch b/SOURCES/cups-kerberos.patch
new file mode 100644
index 0000000..6d88c7f
--- /dev/null
+++ b/SOURCES/cups-kerberos.patch
@@ -0,0 +1,23 @@
+diff --git a/backend/ipp.c b/backend/ipp.c
+index f8bf7e1..8440d2f 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -422,8 +422,7 @@ main(int  argc,				/* I - Number of command-line args */
+   * that way.
+   */
+ 
+-  if (!getuid() && (value = getenv("AUTH_UID")) != NULL &&
+-      !getenv("AUTH_PASSWORD"))
++  if (!getuid() && (value = getenv("AUTH_UID")) != NULL)
+   {
+     uid_t	uid = (uid_t)atoi(value);
+ 					/* User ID */
+@@ -457,7 +456,7 @@ main(int  argc,				/* I - Number of command-line args */
+ 
+ #  else /* No XPC, just try to run as the user ID */
+     if (uid > 0)
+-      seteuid(uid);
++      setuid(uid);
+ #  endif /* HAVE_XPC */
+   }
+ #endif /* HAVE_GSSAPI */
diff --git a/SPECS/cups.spec b/SPECS/cups.spec
index 4291486..8a2c264 100644
--- a/SPECS/cups.spec
+++ b/SPECS/cups.spec
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.2.6
-Release: 50%{?dist}
+Release: 51%{?dist}
 License: GPLv2+ and LGPLv2 with exceptions and AML
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -141,6 +141,8 @@ Patch76: 0001-scheduler-cert.c-Fix-string-comparison-fixes-CVE-202.patch
 Patch77: cups-retry-current-job-man.patch
 # 1910415 - manpage update to acknowledge order dependency of -h option
 Patch78: 0001-Update-man-pages-for-h-option-Issue-357.patch
+# 2130391 - Kerberized IPP Printing Fails
+Patch79: cups-kerberos.patch
 
 Patch1000: cups-lspp.patch
 
@@ -425,6 +427,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch77 -p1 -b .retry-current-job-man
 # 1910415 - manpage update to acknowledge order dependency of -h option
 %patch78 -p1 -b .manpage-update
+# 2130391 - Kerberized IPP Printing Fails
+%patch79 -p1 -b .kerberos
 
 sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
 
@@ -844,6 +848,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Dec 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-51
+- 2130391 - Kerberized IPP Printing Fails
+
 * Fri Jul 01 2022 Richard Lescak <rlescak@redhat.com> - 1:2.2.6-50
 - 1910415 - corrected manpage patch, one lpoptions usage wasn't changed