Merge changes from CUPS 1.4svn-r8088, the real official 1.4b1!

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

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 048dd959d8a880fd2fbc01c1d7a7531ef6644597..850e3b82deb31d6c9233d17d5d400a91235c2eb6 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -2547,7 +2547,7 @@ add_printer(cupsd_client_t  *con, /* I - Client connection */
 
     need_restart_job = 1;
 
-    supported = ippFindAttribute(printer->attrs, "port-monitor-supported",
+    supported = ippFindAttribute(printer->ppd_attrs, "port-monitor-supported",
                                  IPP_TAG_NAME);
     if (supported)
     {
@@ -6340,8 +6340,7 @@ delete_printer(cupsd_client_t  *con,      /* I - Client connection */
            printer->name);
   unlink(filename);
 
-  snprintf(filename, sizeof(filename), "%s/%s.ipp", ServerRoot,
-           printer->name);
+  snprintf(filename, sizeof(filename), "%s/%s.ipp", CacheDir, printer->name);
   unlink(filename);
 
 #ifdef __APPLE__