From: Michael R Sweet Date: Wed, 1 May 2019 18:39:03 +0000 (-0400) Subject: Increase the MultipleOperationTimeOut default to 15 minutes, log an error if X-Git-Tag: v2.3b8~13 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=d6395c6f1d67478e667eedc2e272e26e4400163f Increase the MultipleOperationTimeOut default to 15 minutes, log an error if the job submission times out (Issue #5570) --- diff --git a/CHANGES.md b/CHANGES.md index f673ea222..6e0787e4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.3b8 - 2019-04-18 +CHANGES - 2.3b8 - 2019-05-01 ============================ @@ -11,6 +11,7 @@ Changes in CUPS v2.3b8 - Fixed a performance regression with large PPDs (rdar://47040759) - Fixed a memory reallocation bug in HTTP header value expansion (rdar://problem/50000749) +- Timed out job submission now yields an error (Issue #5570) - Restored minimal support for the `Emulators` keyword in PPD files to allow old Samsung printer drivers to continue to work (Issue #5562) - The scheduler did not encode octetString values like "job-password" correctly diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index 953a26789..b1a0385d5 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -178,7 +178,7 @@ programs to send print jobs or lpinfo(8) to query for available printers using the backend. The one exception is the SNMP backend - see -cups-snmp(8) +cups-snmp(8) for more information.

Notes

CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html index c02f6f1ef..ef6f3f45d 100644 --- a/doc/help/man-cancel.html +++ b/doc/help/man-cancel.html @@ -75,9 +75,9 @@ Cancel all jobs:

Notes

Administrators wishing to prevent unauthorized cancellation of jobs via the -u option should require authentication for Cancel-Jobs operations in -cupsd.conf(5). +cupsd.conf(5).

See Also

-cupsd.conf(5), +cupsd.conf(5), lp(1), lpmove(8), lpstat(1), diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html index f30ec909e..da5126d60 100644 --- a/doc/help/man-classes.conf.html +++ b/doc/help/man-classes.conf.html @@ -12,14 +12,14 @@ classes.conf - class configuration file for cups

Description

The classes.conf file defines the local printer classes that are available. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

-cupsd(8), -cupsd.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index c567cbba7..27a1b60da 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -11,7 +11,7 @@ cups-files.conf - file and directory configuration file for cups

Description

The cups-files.conf file configures the files and directories used by the CUPS scheduler, -cupsd(8). +cupsd(8). It is normally located in the /etc/cups directory.

Each line in the file can be a configuration directive, a blank line, or a comment. Configuration directives typically consist of a name and zero or more values separated by whitespace. @@ -19,7 +19,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Directives

The following directives are understood by -cupsd(8): +cupsd(8):
AccessLog
AccessLog filename @@ -201,8 +201,8 @@ command is used instead.

See Also

classes.conf(5), cups(1), -cupsd(8), -cupsd.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html index ad0e68ed0..7283d7563 100644 --- a/doc/help/man-cups-lpd.html +++ b/doc/help/man-cups-lpd.html @@ -103,7 +103,7 @@ Simply enable the service using the corresponding control program.

See Also

cups(1), -cupsd(8), +cupsd(8), inetconv(1m), inetd(8), launchd(8), diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html index d61d8340f..fbd2dc4eb 100644 --- a/doc/help/man-cups-snmp.conf.html +++ b/doc/help/man-cups-snmp.conf.html @@ -15,7 +15,7 @@ The file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the /etc/cups directory. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.

The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend - -cups-snmp(8). +cups-snmp(8).

Directives

The following directives are understood by the CUPS network backends:
@@ -51,7 +51,7 @@ CUPS backends are deprecated and will no longer be supported in a future feature Printers that do not support IPP can be supported using applications such as ippeveprinter(1).

See Also

-cups-snmp(8), +cups-snmp(8), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html index c7c17f7f4..9ff2b9aef 100644 --- a/doc/help/man-cups-snmp.html +++ b/doc/help/man-cups-snmp.html @@ -47,7 +47,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni

See Also

backend(7), cups-snmp.conf(5), -cupsd(8), +cupsd(8), lpinfo(8), CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html index d75ddc5b0..769ffe64c 100644 --- a/doc/help/man-cups.html +++ b/doc/help/man-cups.html @@ -102,13 +102,13 @@ Printers that do not support IPP can be supported using applications such as ippeveprinter(1).

See Also

cancel(1), -client.conf(7), +client.conf(7), cupsctl(8), -cupsd(8), +cupsd(8), lp(1), lpadmin(8), lpinfo(8), -lpoptions(1), +lpoptions(1), lpr(1), lprm(1), lpq(1), diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html index c52125fc7..897b0541e 100644 --- a/doc/help/man-cupsctl.html +++ b/doc/help/man-cupsctl.html @@ -83,8 +83,8 @@ Disable printer sharing:

Known Issues

You cannot set the Listen or Port directives using cupsctl.

See Also

-cupsd.conf(5), -cupsd(8), +cupsd.conf(5), +cupsd(8),
CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html index e701445d6..308a3a236 100644 --- a/doc/help/man-cupsd-helper.html +++ b/doc/help/man-cupsd-helper.html @@ -44,7 +44,7 @@ cupsd-helper - cupsd helper programs (deprecated) argvN

Description

The cupsd-helper programs perform long-running operations on behalf of the scheduler, -cupsd(8). +cupsd(8). The cups-deviced helper program runs each CUPS backend(7) with no arguments in order to discover the available printers. @@ -76,8 +76,8 @@ Printers that do not support IPP can be supported using applications such as

See Also

backend(7), cups(1), -cupsd(8), -cupsd.conf(5), +cupsd(8), +cupsd.conf(5), filter(7), ppdcfile(5), CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html index 11aac7a76..42d06faad 100644 --- a/doc/help/man-cupsd-logs.html +++ b/doc/help/man-cupsd-logs.html @@ -10,12 +10,12 @@

Name

cupsd-logs - cupsd log files (access_log, error_log, and page_log)

Description

-cupsd(8) +cupsd(8) normally maintains three log files: access_log to track requests that are submitted to the scheduler, error_log to track progress and errors, and page_log to track pages that are printed. Configuration directives in -cupsd.conf(5) +cupsd.conf(5) and -cups-files.conf(5) +cups-files.conf(5) control what information is logged and where it is stored.

Access Log File Format

The access_log file lists each HTTP resource that is accessed by a web browser or client. @@ -93,7 +93,7 @@ For POST requests the bytes field contains the number of bytes of non-IPP data t

The ipp-status field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.

Error Log File Format

The error_log file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the -cupsd.conf(5) +cupsd.conf(5) file controls which messages are logged: 
 
@@ -158,7 +158,7 @@ For example the entry for a two page job called "myjob" might look like:
The PageLogFormat directive in the -cupsd.conf(5) +cupsd.conf(5) file can be used to change this information.

The printer field contains the name of the printer that printed the page. If you send a job to a printer class, this field will contain the name of the printer that was assigned the job. @@ -173,9 +173,9 @@ The format of this field is identical to the data-time field in the access_lo

The media field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.

The sides field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.

See Also

-cupsd(8), -cupsd.conf(5), -cups-files.conf(5), +cupsd(8), +cupsd.conf(5), +cups-files.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 29e217c12..2c7c06e7e 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -13,7 +13,7 @@ cupsd.conf - server configuration file for cups The cupsd.conf file configures the CUPS scheduler, -cupsd(8). +cupsd(8). It is normally located in the /etc/cups directory. @@ -23,7 +23,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Top-level Directives

The following top-level directives are understood by -cupsd(8): +cupsd(8):
AccessLogLevel config
AccessLogLevel actions @@ -119,7 +119,7 @@ The default service name is "http."
HostNameLookups Double
Specifies whether to do reverse lookups on connecting clients. The "Double" setting causes -cupsd(8) +cupsd(8) to verify that the hostname resolved from the address matches one of the addresses returned for that hostname. Double lookups also prevent clients with unregistered addresses from connecting to your server. The default is "Off" to avoid the potential server performance problems with hostname lookups. @@ -128,7 +128,7 @@ Only set this option to "On" or "Double" if absolutely required.
Specifies the length of time to wait before shutting down due to inactivity. The default is "60" seconds. Note: Only applicable when -cupsd(8) +cupsd(8) is run on-demand (e.g., with -l).
JobKillDelay seconds
Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job. @@ -223,7 +223,7 @@ The value "0" disables log rotation. The default is "1048576" (1MB).
MultipleOperationTimeout seconds
Specifies the maximum amount of time to allow between files in a multiple file print job. -The default is "300" (5 minutes). +The default is "900" (15 minutes).
<Policy name> ... </Policy>
Specifies access control for the named policy.
Port number @@ -307,7 +307,7 @@ The default is "No".

Http Method Names

The following HTTP methods are supported by -cupsd(8): +cupsd(8):
GET
Used by a client to download icons and other printer resources and to access the CUPS web interface. @@ -322,7 +322,7 @@ The following HTTP methods are supported by

Ipp Operation Names

The following IPP operations are supported by -cupsd(8): +cupsd(8):
CUPS-Accept-Jobs
Allows a printer to accept new jobs. @@ -415,7 +415,7 @@ The following IPP operations are supported by

Location Paths

The following paths are commonly used when configuring -cupsd(8): +cupsd(8):
/
The path for all get operations (get-printers, get-jobs, etc.) @@ -491,7 +491,7 @@ The default value is "IfRequested".
Require user {user-name|@group-name} ...
Specifies that an authenticated user must match one of the named users or be a member of one of the named groups. The group name "@SYSTEM" corresponds to the list of groups defined by the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file. The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job. Note: The 'root' user is not special and must be granted privileges like any other user account. @@ -514,7 +514,7 @@ The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. "@OWNER" maps to the job's owner. "@SYSTEM" maps to the groups listed for the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file.
JobPrivateValues all
JobPrivateValues default @@ -530,7 +530,7 @@ The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. "@OWNER" maps to the job's owner. "@SYSTEM" maps to the groups listed for the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file.
SubscriptionPrivateValues all
SubscriptionPrivateValues default @@ -577,7 +577,7 @@ The default is "128m".

Notes

File, directory, and user configuration directives that used to be allowed in the cupsd.conf file are now stored in the -cups-files.conf(5) +cups-files.conf(5) file instead in order to prevent certain types of privilege escalation attacks.

The scheduler MUST be restarted manually after making changes to the cupsd.conf file. On Linux this is typically done using the @@ -609,8 +609,8 @@ Require authentication for accesses from outside the 10. network:

See Also

classes.conf(5), -cups-files.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd(8), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html index 589207103..d99136a1b 100644 --- a/doc/help/man-cupsd.html +++ b/doc/help/man-cupsd.html @@ -104,9 +104,9 @@ in the foreground with a test configuration file called backend(7), classes.conf(5), cups(1), -cups-files.conf(5), -cups-lpd(8), -cupsd.conf(5), +cups-files.conf(5), +cups-lpd(8), +cupsd.conf(5), cupsd-helper(8), cupsd-logs(8), filter(7), diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html index bce2134db..6e9d81d89 100644 --- a/doc/help/man-cupsfilter.html +++ b/doc/help/man-cupsfilter.html @@ -117,7 +117,7 @@ The following command will generate a PDF preview of job 42 for a printer named

See Also

cups(1), -cupsd.conf(5), +cupsd.conf(5), filter(7), mime.convs(7), mime.types(7), diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html index 65d896b57..c8070497b 100644 --- a/doc/help/man-filter.html +++ b/doc/help/man-filter.html @@ -177,8 +177,8 @@ program to use the appropriate filters to do the conversions you need.

See Also

backend(7), cups(1), -cups-files.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd(8), cupsfilter(8),
CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html index ba221270f..09b921fb3 100644 --- a/doc/help/man-lp.html +++ b/doc/help/man-lp.html @@ -86,7 +86,7 @@ Use a filename of "-" to force printing from the standard input.

The Default Destination

CUPS provides many ways to set the default destination. The LPDEST and PRINTER environment variables are consulted first. If neither are set, the current default set using the -lpoptions(1) +lpoptions(1) command is used, followed by the default set using the lpadmin(8) command. @@ -138,7 +138,7 @@ The page numbers refer to the output pages and not the document's original pages

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -190,7 +190,7 @@ Print a presentation document 2-up to a printer called "bar":

See Also

cancel(1), lpadmin(8), -lpoptions(1), +lpoptions(1), lpq(1), lpr(1), lprm(1), diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index 755bf2fd9..1ce68ab29 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -60,7 +60,7 @@ Subsequent print jobs submitted via the or lpr(1) commands will use this destination unless the user specifies otherwise with the -lpoptions(1) +lpoptions(1) command.

The second form of the command (-p) configures the named printer or class. The additional options are described below.

The third form of the command (-x) deletes the printer or class destination. @@ -99,7 +99,7 @@ The value is an integer number of seconds; 86,400 seconds are in one day.

-o name=value
Sets a PPD option for the printer. PPD options can be listed using the -l option with the -lpoptions(1) +lpoptions(1) command.
-o name-default=value
Sets a default server-side option for the destination. @@ -189,7 +189,7 @@ Create an IPP Everywhere print queue: cupsaccept(8), cupsenable(8), lpinfo(8), -lpoptions(1), +lpoptions(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html index c945ea9c8..37970b408 100644 --- a/doc/help/man-lpr.html +++ b/doc/help/man-lpr.html @@ -56,7 +56,7 @@ If no files are listed on the command-line, lpr reads the print file from

The Default Destination

CUPS provides many ways to set the default destination. The LPDEST and PRINTER environment variables are consulted first. If neither are set, the current default set using the -lpoptions(1) +lpoptions(1) command is used, followed by the default set using the lpadmin(8) command. @@ -97,7 +97,7 @@ This option is equivalent to -o prettyprint and is only useful when print

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -148,7 +148,7 @@ Print a presentation document 2-up to a printer called "foo": cancel(1), lp(1), lpadmin(8), -lpoptions(1), +lpoptions(1), lpq(1), lprm(1), lpstat(1), diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html index 8f5b87cbb..47dc7a455 100644 --- a/doc/help/man-mailto.conf.html +++ b/doc/help/man-mailto.conf.html @@ -33,7 +33,7 @@ If multiple lines are present, only the last one is used.
Specifies a prefix string for the subject line of an email notification.

See Also

-cupsd(8), +cupsd(8), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html index e4d8813c8..6afbc71a3 100644 --- a/doc/help/man-mime.convs.html +++ b/doc/help/man-mime.convs.html @@ -46,9 +46,9 @@ CUPS filters are deprecated and will no longer be supported in a future feature Printers that do not support IPP can be supported using applications such as ippeveprinter(1).

See Also

-cups-files.conf(5), -cupsd.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), cupsfilter(8), mime.types(5), CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html index cc4393ef8..28d166cac 100644 --- a/doc/help/man-mime.types.html +++ b/doc/help/man-mime.types.html @@ -84,9 +84,9 @@ Define two MIME media types for raster data, with one being a subset with higher string(4,PwgRaster<00>) priority(150)

See Also

-cups-files.conf(5), -cupsd.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), cupsfilter(8), mime.convs(5), CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html index d8d96d36c..27e051fdb 100644 --- a/doc/help/man-notifier.html +++ b/doc/help/man-notifier.html @@ -27,7 +27,7 @@ Notifiers are encouraged to exit after a suitable period of inactivity, however Notifiers inherit the environment and can use the logging mechanism documented in filter(7).

See Also

-cupsd(8), +cupsd(8), filter(7), CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html index 4a3123ea5..a2f8ba68e 100644 --- a/doc/help/man-printers.conf.html +++ b/doc/help/man-printers.conf.html @@ -11,15 +11,15 @@ printers.conf - printer configuration file for cups

Description

The printers.conf file defines the local printers that are available. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

classes.conf(5), -cups-files.conf(5), -cupsd(8), -cupsd.conf(5), +cups-files.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), subscriptions.conf(5), diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html index 325f2cd28..fb7ec0287 100644 --- a/doc/help/man-subscriptions.conf.html +++ b/doc/help/man-subscriptions.conf.html @@ -12,16 +12,16 @@ subscriptions.conf - subscription configuration file for cups

Description

The subscriptions.conf file defines the local event notification subscriptions that are active. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

classes.conf(5), -cups-files.conf(5), -cupsd(8), -cupsd.conf(5), +cups-files.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 index 242543e10..907787364 100644 --- a/man/cupsd.conf.5 +++ b/man/cupsd.conf.5 @@ -7,7 +7,7 @@ .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cupsd.conf 5 "CUPS" "26 April 2019" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "1 May 2019" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -345,7 +345,7 @@ The default is "1048576" (1MB). .TP 5 \fBMultipleOperationTimeout \fIseconds\fR Specifies the maximum amount of time to allow between files in a multiple file print job. -The default is "300" (5 minutes). +The default is "900" (15 minutes). .\"#Policy .TP 5 \fB \fR... \fB\fR diff --git a/scheduler/conf.c b/scheduler/conf.c index 1a2b1e1ce..85950a17d 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -729,7 +729,7 @@ cupsdReadConfiguration(void) MaxClientsPerHost = 0; MaxLogSize = 1024 * 1024; MaxRequestSize = 0; - MultipleOperationTimeout = DEFAULT_TIMEOUT; + MultipleOperationTimeout = 900; NumSystemGroups = 0; ReloadTimeout = DEFAULT_KEEPALIVE; RootCertDuration = 300; diff --git a/scheduler/job.c b/scheduler/job.c index 26cffdb61..f063c7d41 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -306,8 +306,8 @@ cupsdCheckJobs(void) continue; } - cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, - "Job submission timed out."); + cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, "Job submission timed out."); + cupsdLogJob(job, CUPSD_LOG_ERROR, "Job submission timed out."); } /*