From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Wed, 8 Nov 2017 22:30:45 +0000 (-0500)
Subject: The scheduler did not write out dirty configuration and state files if there
X-Git-Tag: v2.3b1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb2cb9b09fb5ecc44c8b369675ebf06b130a44d7;p=thirdparty%2Fcups.git

The scheduler did not write out dirty configuration and state files if there
were open client connections (Issue #5118)

(reverted b393bc2)
---

diff --git a/CHANGES.md b/CHANGES.md
index e8ad74f1f1..9180ab32ce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -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)
diff --git a/scheduler/main.c b/scheduler/main.c
index 8925c83733..78bd757e13 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -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.
  */
 
 /*
@@ -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__