blob: ed84af2d8c1bd621c4996f2808495f574d47b1c1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
XXXXXXXXXXXXX
commit 8441e27ce4008828cbdd25bdd6249c0019853b92
Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri May 9 20:57:11 2014 +0000
CUPS did not compile when Avahi or mDNSResponder was not present (STR #4402)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11871 a1ca3aef-8c08-0410-bb20-df032aa958be
XXXXXXXXXXXXX
This is a modified version of the patch omitting the changelog,
which otherwise prevents the patch from applying.
-gmt
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 495bf1b..4e417b0 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
if (BrowseLocalProtocols & BROWSE_SMB)
update_smb(1);
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
/*
* Register the individual printers
*/
dnssdRegisterAllPrinters(0);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
}
@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
if (!Browsing || !BrowseLocalProtocols)
return;
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
/*
* De-register the individual printers
*/
@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
* Shut down browsing sockets...
*/
-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
dnssdStop();
#endif /* HAVE_DNSSD || HAVE_AVAHI */
|
GitWeb
