Skip to content

Commit

Permalink
The scheduler did not write out dirty configuration and state files i…
Browse files Browse the repository at this point in the history
…f there

were open client connections (Issue #5118)

(reverted b393bc2)
  • Loading branch information
Michael R Sweet committed Nov 8, 2017
1 parent d562164 commit eb2cb9b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Changes in CUPS v2.3b1
printer cannot be found (Issue #5096)
- The `lpadmin` command now provides a better error message when an unsupported
System V interface script is used (Issue #5111)
- The scheduler did not write out dirty configuration and state files if there
were open client connections (Issue #5118)
- The `SSLOptions` directive now supports `MinTLS` and `MaxTLS` options to
control the minimum and maximum TLS versions that will be allowed,
respectively (Issue #5119)
Expand Down
9 changes: 3 additions & 6 deletions scheduler/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
* Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
* file is missing or damaged, see the license at "http://www.cups.org/".
* Licensed under Apache License v2.0. See the file "LICENSE" for more
* information.
*/

/*
Expand Down Expand Up @@ -893,7 +890,7 @@ main(int argc, /* I - Number of command-line args */
* Write dirty config/state files...
*/

if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0)
if (DirtyCleanTime && current_time >= DirtyCleanTime)
cupsdCleanDirty();

#ifdef __APPLE__
Expand Down

0 comments on commit eb2cb9b

Please sign in to comment.