From 416d1904585976b35c430f381a91ed2a340769a3 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 26 Apr 2021 13:08:50 +0200
Subject: [PATCH] 1949053 - CUPS doesn't start if sssd starts after cupsd

Resolves: rhbz#1949053
---
 cups-nssuserlookup-target.patch | 13 +++++++++++++
 cups.spec                       |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 cups-nssuserlookup-target.patch

diff --git a/cups-nssuserlookup-target.patch b/cups-nssuserlookup-target.patch
new file mode 100644
index 0000000..35eff69
--- /dev/null
+++ b/cups-nssuserlookup-target.patch
@@ -0,0 +1,13 @@
+diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in
+index a3fa0e8..baff51b 100644
+--- a/scheduler/cups.service.in
++++ b/scheduler/cups.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+-After=network.target sssd.service ypbind.service nslcd.service
++After=network.target nss-user-lookup.target nslcd.service
+ Requires=cups.socket
+ 
+ [Service]
diff --git a/cups.spec b/cups.spec
index a30bbe3..4af0cd8 100644
--- a/cups.spec
+++ b/cups.spec
@@ -17,7 +17,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.3.3%{OP_VER}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ASL 2.0
 Url: http://www.cups.org/
 # Apple stopped uploading the new versions into github, use OpenPrinting fork
@@ -71,6 +71,8 @@ Patch100: cups-lspp.patch
 %endif
 
 #### UPSTREAM PATCHES (starts with 1000) ####
+# 1949053 - CUPS doesn't start if sssd starts after cupsd
+Patch15: cups-nssuserlookup-target.patch
 
 ##### Patches removed because IMHO they aren't no longer needed
 ##### but still I'll leave them in git in case their removal
@@ -271,6 +273,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
 %patch13 -p1 -b .dymo-deviceid
 # add [Job N] to logs
 %patch14 -p1 -b .logs
+# 1949053 - CUPS doesn't start if sssd starts after cupsd
+%patch15 -p1 -b .nsslookup
 
 # UPSTREAM PATCHES
 
@@ -670,6 +674,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man7/ippeveps.7.gz
 
 %changelog
+* Mon Apr 26 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-5
+- 1949053 - CUPS doesn't start if sssd starts after cupsd
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.3.3op2-4
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937