The scheduler no longer listens on the loopback interface unless the web

interface or printer sharing are enabled (<rdar://problem/9136448>)

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 6b91161625307bff81323715be9c3f227d86b467..c4b44946cbd34d78447be04c1736b6ef41306472 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.1b1 - 2015-02-05
+CHANGES.txt - 2.1b1 - 2015-02-06
 --------------------------------
 
 CHANGES IN CUPS V2.1b1
@@ -18,3 +18,6 @@ CHANGES IN CUPS V2.1b1
          (STR #4469)
        - Added support for WITH-VALUE-FROM predicate in ipptool test files
          (STR #4470)
+       - The scheduler no longer listens on the loopback interface unless the
+         web interface or printer sharing are enabled
+         (<rdar://problem/9136448>)

diff --git a/scheduler/main.c b/scheduler/main.c
index 21985b228b708399f95f067b1879add8ec3fd1ab..64675e77068610981e46c41a07fb9c1a08406cca 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -2121,14 +2121,12 @@ service_checkout(void)
 
 
  /*
-  * Create or remove the systemd path file based on whether there are active
+  * Create or remove the "keep-alive" file based on whether there are active
   * jobs or shared printers to advertise...
   */
 
   if (cupsArrayCount(ActiveJobs) ||    /* Active jobs */
-#  ifdef HAVE_SYSTEMD
       WebInterface ||                  /* Web interface enabled */
-#  endif /* HAVE_SYSTEMD */
       (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
                                        /* Printers being shared */
   {

diff --git a/scheduler/org.cups.cupsd.plist b/scheduler/org.cups.cupsd.plist
index 413575be42e354f17c49bda1b3dacce64cc0d566..c0755c47b2c4779de9d0a8523a844ca1ddf1b955 100644 (file)
--- a/scheduler/org.cups.cupsd.plist
+++ b/scheduler/org.cups.cupsd.plist
@@ -39,18 +39,6 @@
        <dict>
                <key>Listeners</key>
                <array>
-                       <dict>
-                               <key>SockNodeName</key>
-                               <string>::1</string>
-                               <key>SockServiceName</key>
-                               <string>ipp</string>
-                       </dict>
-                       <dict>
-                               <key>SockNodeName</key>
-                               <string>127.0.0.1</string>
-                               <key>SockServiceName</key>
-                               <string>ipp</string>
-                       </dict>
                        <dict>
                                <key>SockPathMode</key>
                                <integer>49663</integer>