Update dependencies, fix some web UI bugs, and fix cupsenable/disable

bug.

systemv/accept.c:
    - main(): Fix cupsenable/cupsdisable name checking.

cgi-bin/jobs.c:
    - do_job_op(): Need to snprintf() the URI before adding it...

cgi-bin/printers.c:
    - Add debugging stuff.

scheduler/ipp.c:
    - authenticate_job(): Send HTTP unauthorized error instead of
      IPP forbidden.
    - cancel_job(): Send HTTP unauthorized error instead of IPP
      forbidden.
    - hold_job(): Send HTTP unauthorized error instead of IPP
      forbidden.
    - move_job(): Send HTTP unauthorized error instead of IPP
      forbidden.
    - release_job(): Send HTTP unauthorized error instead of IPP
      forbidden.
    - restart_job(): Send HTTP unauthorized error instead of IPP
      forbidden.
    - send_document(): Send HTTP unauthorized error instead of
      IPP forbidden.
    - set_job_attrs(): Send HTTP unauthorized error instead of
      IPP forbidden.

scheduler/job.c:
    - cupsdCheckJobs(): Add debug stuff.

Fix printe

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@5104 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index 7d4f84994613c532afe03f3a786612f5c04280a5..d31fdd7f5fde7192a6d57dddfa06758cebc1c6c1 100644 (file)
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -164,11 +164,11 @@ do_job_op(http_t      *http,              /* I - HTTP connection */
 
   request = ippNewRequest(op);
 
+  snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", job_id);
+
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
                NULL, uri);
 
-  snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", job_id);
-
   if ((user = getenv("REMOTE_USER")) == NULL)
     user = "guest";
 

diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index e425a5ac8d89dda042b88ffbc0c8e323d671dd45..425d0472a695ca649bd33ba3030103a37689bc4d 100644 (file)
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -201,6 +201,9 @@ show_all_printers(http_t     *http, /* I - Connection to server */
                        *urlend;        /* End of URL */
 
 
+  fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
+          http, user);
+
  /*
   * Show the standard header...
   */
@@ -382,6 +385,9 @@ show_printer(http_t     *http,              /* I - Connection to server */
   char         refresh[1024];          /* Refresh URL */
 
 
+  fprintf(stderr, "DEBUG: show_printer(http=%p, printer=\"%s\")\n",
+          http, printer);
+
  /*
   * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
   * attributes:

diff --git a/cups/Dependencies b/cups/Dependencies
index f4b6f6787b098b25e194c795db4acb8b482c91cb..d77ea16abe77627f8a0feead7a43e25f4c126446 100644 (file)
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -58,7 +58,8 @@ page.o: ppd.h array.h file.h string.h ../config.h
 ppd.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h
 ppd.o: file.h language.h i18n.h normalize.h transcode.h debug.h
 snprintf.o: string.h ../config.h
-string.o: string.h ../config.h
+string.o: debug.h string.h ../config.h globals.h cups.h ipp.h http.h md5.h
+string.o: ppd.h array.h file.h language.h i18n.h normalize.h transcode.h
 tempfile.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
 tempfile.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 transcode.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h

diff --git a/filter/Dependencies b/filter/Dependencies
index 243dc3e9baf491fb6bc9de8fd4e6b12f6aa681c2..b790955637380412bdb33083d1d9f6d6255565f6 100644 (file)
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -115,7 +115,8 @@ common.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 common.o: ../cups/language.h ../cups/string.h ../config.h
 pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 pstops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-pstops.o: ../cups/language.h ../cups/string.h ../config.h
+pstops.o: ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
+pstops.o: ../cups/array.h
 raster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 raster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 raster.o: ../cups/string.h ../config.h

diff --git a/locale/Makefile b/locale/Makefile
index 5242c016cf1928a3be422cfe94091daeca4a205c..ca5e67d00aed74e16f437c32bf7f583aa8372c15 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -46,6 +46,13 @@ clean:
        $(RM) translate translate.o
 
 
+#
+# Update dependencies...
+#
+
+depend:
+
+
 #
 # Install files...
 #

diff --git a/monitor/Dependencies b/monitor/Dependencies
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..52599cfa1443629c235903823aa5de261575bd73 100644 (file)
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -0,0 +1,8 @@
+# DO NOT DELETE
+
+bcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
+bcp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+bcp.o: ../cups/file.h ../cups/language.h
+tbcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
+tbcp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+tbcp.o: ../cups/file.h ../cups/language.h

diff --git a/notifier/Dependencies b/notifier/Dependencies
index f13e6eb1ae2a20f2fd267b1f2472023cb84ad05a..6867d6207b8b92c32185c29effb2c4ddf3881cc7 100644 (file)
--- a/notifier/Dependencies
+++ b/notifier/Dependencies
@@ -1,8 +1,8 @@
 # DO NOT DELETE
 
 mailto.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-mailto.o: ../cups/ppd.h ../cups/file.h ../cups/language.h ../cups/array.h
-mailto.o: ../cups/string.h ../config.h
+mailto.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+mailto.o: ../cups/i18n.h ../cups/string.h ../config.h
 testnotify.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testnotify.o: ../cups/ppd.h ../cups/file.h ../cups/language.h ../cups/array.h
-testnotify.o: ../cups/string.h ../config.h
+testnotify.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testnotify.o: ../cups/language.h ../cups/string.h ../config.h

diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index 0faf79818322e7dc052f3a856fd54208aa73525a..7ca0a4300d76163fe38602abcf789ef78a612350 100644 (file)
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -1,176 +1,198 @@
 # DO NOT DELETE
 
 auth.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-auth.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-auth.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-auth.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-auth.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-auth.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-auth.o: network.h subscriptions.h
+auth.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+auth.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+auth.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+auth.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+auth.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+auth.o: banners.h dirsvc.h network.h subscriptions.h
 banners.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-banners.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-banners.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-banners.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-banners.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-banners.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-banners.o: network.h subscriptions.h ../cups/dir.h
+banners.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+banners.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+banners.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+banners.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+banners.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+banners.o: classes.h job.h conf.h banners.h dirsvc.h network.h
+banners.o: subscriptions.h ../cups/dir.h
 cert.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-cert.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-cert.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-cert.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-cert.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-cert.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-cert.o: network.h subscriptions.h
+cert.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+cert.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+cert.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+cert.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+cert.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+cert.o: banners.h dirsvc.h network.h subscriptions.h
 classes.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-classes.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-classes.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-classes.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-classes.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-classes.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-classes.o: network.h subscriptions.h
+classes.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+classes.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+classes.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+classes.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+classes.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+classes.o: classes.h job.h conf.h banners.h dirsvc.h network.h
+classes.o: subscriptions.h
 client.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-client.o: cupsd.h ../cups/string.h ../cups/array.h ../cups/cups.h
-client.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-client.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-client.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-client.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-client.o: network.h subscriptions.h
+client.o: ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/string.h
+client.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+client.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+client.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+client.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+client.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 conf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-conf.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-conf.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-conf.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-conf.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-conf.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-conf.o: network.h subscriptions.h ../cups/dir.h
+conf.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+conf.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+conf.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+conf.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+conf.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+conf.o: banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
 dirsvc.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-dirsvc.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-dirsvc.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-dirsvc.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-dirsvc.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-dirsvc.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-dirsvc.o: network.h subscriptions.h
+dirsvc.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+dirsvc.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+dirsvc.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+dirsvc.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+dirsvc.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+dirsvc.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 env.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-env.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-env.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-env.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-env.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-env.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-env.o: network.h subscriptions.h
+env.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+env.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+env.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+env.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+env.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+env.o: banners.h dirsvc.h network.h subscriptions.h
 main.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-main.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-main.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-main.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-main.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-main.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-main.o: network.h subscriptions.h
+main.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+main.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+main.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+main.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+main.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+main.o: banners.h dirsvc.h network.h subscriptions.h
 ipp.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-ipp.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-ipp.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-ipp.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-ipp.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-ipp.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-ipp.o: network.h subscriptions.h
+ipp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+ipp.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+ipp.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+ipp.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+ipp.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+ipp.o: banners.h dirsvc.h network.h subscriptions.h
 listen.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-listen.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-listen.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-listen.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-listen.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-listen.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-listen.o: network.h subscriptions.h
+listen.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+listen.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+listen.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+listen.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+listen.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+listen.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 job.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-job.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-job.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-job.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-job.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-job.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-job.o: network.h subscriptions.h ../cups/backend.h ../cups/dir.h
+job.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+job.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+job.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+job.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+job.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+job.o: banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h
+job.o: ../cups/dir.h
 log.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-log.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-log.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-log.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-log.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-log.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-log.o: network.h subscriptions.h
+log.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+log.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+log.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+log.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h
+log.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h
+log.o: banners.h dirsvc.h network.h subscriptions.h
 network.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-network.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-network.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-network.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-network.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-network.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-network.o: network.h subscriptions.h
+network.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+network.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+network.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+network.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+network.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+network.o: classes.h job.h conf.h banners.h dirsvc.h network.h
+network.o: subscriptions.h
 policy.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-policy.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-policy.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-policy.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-policy.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-policy.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-policy.o: network.h subscriptions.h
+policy.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+policy.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+policy.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+policy.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+policy.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+policy.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 printers.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-printers.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-printers.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-printers.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-printers.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
+printers.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+printers.o: ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+printers.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h
+printers.o: ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+printers.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h
 printers.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-printers.o: network.h subscriptions.h
+printers.o: network.h subscriptions.h ../cups/transcode.h
 process.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-process.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-process.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-process.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-process.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-process.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-process.o: network.h subscriptions.h
+process.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+process.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+process.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+process.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+process.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+process.o: classes.h job.h conf.h banners.h dirsvc.h network.h
+process.o: subscriptions.h
 quotas.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-quotas.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-quotas.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-quotas.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-quotas.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-quotas.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-quotas.o: network.h subscriptions.h
+quotas.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+quotas.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+quotas.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+quotas.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+quotas.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+quotas.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 server.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-server.o: cupsd.h ../cups/string.h ../cups/array.h ../cups/cups.h
-server.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-server.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-server.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-server.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-server.o: network.h subscriptions.h
+server.o: ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/string.h
+server.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+server.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+server.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+server.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+server.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 statbuf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-statbuf.o: ../cups/md5.h ../cups/string.h ../cups/array.h ../cups/cups.h
-statbuf.o: ../cups/ipp.h ../cups/ppd.h ../cups/file.h mime.h ../cups/ipp.h
-statbuf.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/language.h
-statbuf.o: ../cups/array.h ../cups/debug.h statbuf.h cert.h auth.h client.h
-statbuf.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-statbuf.o: network.h subscriptions.h
+statbuf.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+statbuf.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+statbuf.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+statbuf.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+statbuf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+statbuf.o: classes.h job.h conf.h banners.h dirsvc.h network.h
+statbuf.o: subscriptions.h
 subscriptions.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
-subscriptions.o: ../cups/md5.h ../cups/string.h ../cups/array.h
-subscriptions.o: ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/file.h
-subscriptions.o: mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h
-subscriptions.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
-subscriptions.o: ../cups/debug.h statbuf.h cert.h auth.h client.h policy.h
-subscriptions.o: printers.h classes.h job.h conf.h banners.h dirsvc.h
-subscriptions.o: network.h subscriptions.h
-filter.o: ../cups/debug.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-filter.o: ../cups/file.h
-mime.o: ../cups/string.h ../config.h mime.h ../cups/ipp.h ../cups/file.h
-type.o: ../cups/string.h ../config.h mime.h ../cups/ipp.h ../cups/file.h
-type.o: ../cups/debug.h
+subscriptions.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+subscriptions.o: ../cups/string.h ../cups/array.h ../cups/cups.h
+subscriptions.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
+subscriptions.o: ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+subscriptions.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h
+subscriptions.o: statbuf.h cert.h auth.h client.h policy.h printers.h
+subscriptions.o: classes.h job.h conf.h banners.h dirsvc.h network.h
+subscriptions.o: subscriptions.h
+sysman.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+sysman.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h
+sysman.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+sysman.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+sysman.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h
+sysman.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+sysman.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
+filter.o: ../cups/debug.h ../cups/string.h ../config.h mime.h ../cups/array.h
+filter.o: ../cups/ipp.h ../cups/file.h
+mime.o: ../cups/dir.h ../cups/string.h ../config.h mime.h ../cups/array.h
+mime.o: ../cups/ipp.h ../cups/file.h
+type.o: ../cups/string.h ../config.h mime.h ../cups/array.h ../cups/ipp.h
+type.o: ../cups/file.h ../cups/debug.h
 cups-deviced.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-cups-deviced.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/file.h
-cups-deviced.o: ../cups/string.h ../config.h ../cups/array.h ../cups/dir.h
+cups-deviced.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cups-deviced.o: ../cups/language.h ../cups/file.h ../cups/string.h
+cups-deviced.o: ../config.h ../cups/array.h ../cups/dir.h
 cups-driverd.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-cups-driverd.o: ../cups/md5.h ../cups/ppd.h ../cups/file.h ../cups/file.h
-cups-driverd.o: ../cups/string.h ../config.h ../cups/dir.h
-cups-lpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-cups-lpd.o: ../cups/ppd.h ../cups/file.h ../cups/string.h ../config.h
-cups-lpd.o: ../cups/language.h ../cups/array.h
+cups-driverd.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cups-driverd.o: ../cups/language.h ../cups/file.h ../cups/string.h
+cups-driverd.o: ../config.h ../cups/dir.h
+cups-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+cups-lpd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h
+cups-lpd.o: ../cups/array.h ../cups/file.h ../cups/language.h
+cups-lpd.o: ../cups/string.h ../cups/language.h
 cups-polld.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-cups-polld.o: ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/file.h
-cups-polld.o: ../cups/language.h ../cups/array.h ../cups/string.h
+cups-polld.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
+cups-polld.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+cups-polld.o: ../cups/language.h ../cups/string.h
 testdirsvc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testdirsvc.o: ../cups/ppd.h ../cups/file.h ../cups/string.h ../config.h
-testmime.o: ../cups/string.h ../config.h mime.h ../cups/ipp.h ../cups/file.h
+testdirsvc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testdirsvc.o: ../cups/string.h ../config.h
+testmime.o: ../cups/string.h ../config.h mime.h ../cups/array.h ../cups/ipp.h
+testmime.o: ../cups/file.h ../cups/dir.h
 testspeed.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testspeed.o: ../cups/ppd.h ../cups/file.h ../cups/language.h ../cups/array.h
-testspeed.o: ../cups/debug.h
+testspeed.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testspeed.o: ../cups/language.h ../cups/debug.h
 util.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-util.o: ../cups/ppd.h ../cups/file.h ../cups/file.h ../cups/string.h
-util.o: ../config.h
+util.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+util.o: ../cups/file.h ../cups/string.h ../config.h

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index f7f6c7960c1f9b02a697f33599e1d95eab570640..3c101bbe57728dd039ce2541057d1878ece0f30a 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -2233,10 +2233,7 @@ authenticate_job(cupsd_client_t  *con,   /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("You are not authorized to authenticate "
-                     "job #%d owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 
@@ -2551,10 +2548,7 @@ cancel_job(cupsd_client_t  *con, /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("You are not authorized to delete job #%d "
-                     "owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 
@@ -6263,9 +6257,7 @@ hold_job(cupsd_client_t  *con,            /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("Not authorized to hold job #%d owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 
@@ -6520,10 +6512,7 @@ move_job(cupsd_client_t  *con,           /* I - Client connection */
 
     if (!validate_user(job, con, job->username, username, sizeof(username)))
     {
-      send_ipp_status(con, IPP_FORBIDDEN,
-                      _("You are not authorized to move job #%d owned "
-                       "by \"%s\"!"),
-                      job->id, job->username);
+      send_http_error(con, HTTP_UNAUTHORIZED);
       return;
     }
 
@@ -7784,10 +7773,7 @@ release_job(cupsd_client_t  *con,        /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("You are not authorized to release job id "
-                     "%d owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 
@@ -8020,10 +8006,7 @@ restart_job(cupsd_client_t  *con,        /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("You are not authorized to restart job id "
-                     "%d owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 
@@ -8230,10 +8213,7 @@ send_document(cupsd_client_t  *con,      /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("You are not authorized to send document "
-                     "for job #%d owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 
@@ -8753,10 +8733,7 @@ set_job_attrs(cupsd_client_t  *con,      /* I - Client connection */
 
   if (!validate_user(job, con, job->username, username, sizeof(username)))
   {
-    send_ipp_status(con, IPP_FORBIDDEN,
-                    _("You are not authorized to alter job id "
-                     "%d owned by \"%s\"!"),
-                    jobid, job->username);
+    send_http_error(con, HTTP_UNAUTHORIZED);
     return;
   }
 

diff --git a/scheduler/job.c b/scheduler/job.c
index fd762d7d589d292e577a15802d42a54d0ee7f8fb..12343279f0d5b2bd6b1990c9fba25cb45000dadb 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -290,6 +290,10 @@ cupsdCheckJobs(void)
 
   DEBUG_puts("cupsdCheckJobs()");
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "cupsdCheckJobs: %d active jobs, sleeping=%d, reload=%d",
+                  cupsArrayCount(ActiveJobs), Sleeping, NeedReload);
+
   for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
        job;
        job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
@@ -298,6 +302,9 @@ cupsdCheckJobs(void)
     * Start held jobs if they are ready...
     */
 
+    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCheckJobs: Job %d: state_value=%d",
+                    job->id, job->state_value);
+
     if (job->state_value == IPP_JOB_HELD &&
         job->hold_until &&
        job->hold_until < time(NULL))

diff --git a/systemv/Dependencies b/systemv/Dependencies
index 0d7585b86db100a1c1aab44f7bb269ac26c1ed9d..d24772b5c3b8c7468899dc373985100e13aba14a 100644 (file)
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -1,36 +1,36 @@
 # DO NOT DELETE
 
 accept.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-accept.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-accept.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
+accept.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+accept.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 cancel.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-cancel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-cancel.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
+cancel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+cancel.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 cupsaddsmb.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-cupsaddsmb.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-cupsaddsmb.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
+cupsaddsmb.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+cupsaddsmb.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 cupsaddsmb.o: ../cups/debug.h
 cupstestppd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-cupstestppd.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-cupstestppd.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
+cupstestppd.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+cupstestppd.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 lp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lp.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
+lp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lp.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 lpadmin.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpadmin.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lpadmin.o: ../cups/i18n.h ../cups/language.h ../cups/array.h ../cups/debug.h
+lpadmin.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lpadmin.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h
 lpinfo.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpinfo.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lpinfo.o: ../cups/i18n.h ../cups/language.h ../cups/array.h ../cups/debug.h
+lpinfo.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lpinfo.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h
 lpmove.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpmove.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lpmove.o: ../cups/i18n.h ../cups/language.h ../cups/array.h ../cups/debug.h
+lpmove.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lpmove.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h
 lpoptions.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpoptions.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lpoptions.o: ../cups/i18n.h ../cups/language.h ../cups/array.h
+lpoptions.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lpoptions.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 lppasswd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lppasswd.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lppasswd.o: ../cups/i18n.h ../cups/language.h ../cups/array.h ../cups/md5.h
+lppasswd.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lppasswd.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/md5.h
 lpstat.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpstat.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/file.h
-lpstat.o: ../cups/i18n.h ../cups/language.h ../cups/array.h ../cups/debug.h
+lpstat.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+lpstat.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h

diff --git a/systemv/accept.c b/systemv/accept.c
index 45236e4c65163d248dc1823f514867a677239753..ed6aa44ee30b89938a5e98f3e8279ca40829ba7c 100644 (file)
--- a/systemv/accept.c
+++ b/systemv/accept.c
@@ -73,9 +73,9 @@ main(int  argc,                               /* I - Number of command-line arguments */
     op = CUPS_ACCEPT_JOBS;
   else if (!strcmp(command, "reject"))
     op = CUPS_REJECT_JOBS;
-  else if (!strcmp(command, "disable"))
+  else if (!strcmp(command, "cupsdisable") || !strcmp(command, "disable"))
     op = IPP_PAUSE_PRINTER;
-  else if (!strcmp(command, "enable"))
+  else if (!strcmp(command, "cupsenable") || !strcmp(command, "enable"))
     op = IPP_RESUME_PRINTER;
   else
   {

diff --git a/test/Dependencies b/test/Dependencies
index cb014d95defbc9ad695e8a10b55116193e634fa5..15b3056c8d62db6e1674bf11f4bb706bf08ee30c 100644 (file)
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -1,4 +1,5 @@
 # DO NOT DELETE
 
 ipptest.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-ipptest.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/language.h
+ipptest.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+ipptest.o: ../cups/file.h ../cups/language.h ../cups/language.h