Printer sharing did not work when systemd was being used (STR #4497)

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

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index e5b9bc757002ca5b71986617046814a34c2b1729..a2cb4ae1221c3dbefa4f5cf3d98f81890f4c960c 100644 (file)
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -5,6 +5,7 @@ CHANGES IN CUPS V2.0.1
 
        - Security: SSLv3 is now disabled by default to protect against the
          POODLE attack (STR #4476)
+       - Printer sharing did not work when systemd was being used (STR #4497)
        - Fixed a crash in ippAttributeString (<rdar://problem/17903871>)
        - RPMs did not build (STR #4490)
 

diff --git a/scheduler/main.c b/scheduler/main.c
index 259efd78e69926f2864fd4d98b3965c8dffca41a..78243def0e54ae3eb06590ad3ee45b614ba0dea9 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -763,6 +763,9 @@ main(int  argc,                             /* I - Number of command-line args */
 
     if (timeout == 86400 && OnDemand && IdleExitTimeout &&
         !cupsArrayCount(ActiveJobs) &&
+#  ifdef HAVE_SYSTEMD
+        !WebInterface &&
+#  endif /* HAVE_SYSTEMD */
        (!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
     {
       timeout          = IdleExitTimeout;
@@ -2114,8 +2117,12 @@ service_checkout(void)
   * jobs or shared printers to advertise...
   */
 
-  if (cupsArrayCount(ActiveJobs) ||
+  if (cupsArrayCount(ActiveJobs) ||    /* Active jobs */
+#  ifdef HAVE_SYSTEMD
+      WebInterface ||                  /* Web interface enabled */
+#  endif /* HAVE_SYSTEMD */
       (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
+                                       /* Printers being shared */
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Creating keep-alive file \"" CUPS_KEEPALIVE "\".");
 

diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index cd98aa56e0b9ffc156028a9296b0aae71ee85241..b0928c51c889609a9d0652edbe93988f3719a5fc 100644 (file)
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -3,10 +3,6 @@ Description=CUPS Scheduler
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-ListenStream=[::1]:631
-ListenStream=127.0.0.1:631
-BindIPv6Only=ipv6-only
-ReusePort=true
 
 [Install]
 WantedBy=sockets.target