git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12216
a1ca3aef-8c08-0410-bb20-
df032aa958be
- Security: SSLv3 is now disabled by default to protect against the
POODLE attack (STR #4476)
- 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)
- Fixed a crash in ippAttributeString (<rdar://problem/17903871>)
- RPMs did not build (STR #4490)
if (timeout == 86400 && OnDemand && IdleExitTimeout &&
!cupsArrayCount(ActiveJobs) &&
if (timeout == 86400 && OnDemand && IdleExitTimeout &&
!cupsArrayCount(ActiveJobs) &&
+# ifdef HAVE_SYSTEMD
+ !WebInterface &&
+# endif /* HAVE_SYSTEMD */
(!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
{
timeout = IdleExitTimeout;
(!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
{
timeout = IdleExitTimeout;
* jobs or shared printers to advertise...
*/
* 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)))
(Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
+ /* Printers being shared */
{
cupsdLogMessage(CUPSD_LOG_DEBUG, "Creating keep-alive file \"" CUPS_KEEPALIVE "\".");
{
cupsdLogMessage(CUPSD_LOG_DEBUG, "Creating keep-alive file \"" CUPS_KEEPALIVE "\".");
[Socket]
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
[Socket]
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-ListenStream=[::1]:631
-ListenStream=127.0.0.1:631
-BindIPv6Only=ipv6-only
-ReusePort=true
[Install]
WantedBy=sockets.target
[Install]
WantedBy=sockets.target