Merge changes from CUPS 1.5svn-r9037.

[thirdparty/cups.git] / scheduler / policy.c

diff --git a/scheduler/policy.c b/scheduler/policy.c
index 4fefbd16a45fbacb5954f18df25b016e11ebecd4..b7deab72ab809512b07523b2db566af983b99b33 100644 (file)
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -213,11 +213,25 @@ cupsdDeleteAllPolicies(void)
 {
   cupsd_policy_t       *p;             /* Current policy */
   cupsd_location_t     *po;            /* Current policy op */
+  cupsd_printer_t      *printer;       /* Current printer */
 
 
   if (!Policies)
     return;
 
+ /*
+  * First clear the policy pointers for all printers...
+  */
+
+  for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
+       printer;
+       printer = (cupsd_printer_t *)cupsArrayNext(Printers))
+    printer->op_policy_ptr = NULL;
+
+ /*
+  * Then free all of the policies...
+  */
+
   for (p = (cupsd_policy_t *)cupsArrayFirst(Policies);
        p;
        p = (cupsd_policy_t *)cupsArrayNext(Policies))