From: msweet Date: Thu, 31 Jul 2014 00:58:00 +0000 (+0000) Subject: Remove implementation of cupsGetClasses, cupsGetPrinters, and cupsTempFile; X-Git-Tag: v2.2b1~539 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=240214ef2354ccad90d971e5d935cda6842e0697;p=thirdparty%2Fcups.git Remove implementation of cupsGetClasses, cupsGetPrinters, and cupsTempFile; these functions are still exported but they all now return empty results. Update API documentation. Update version number to 2.0b1 without SVN identifier. Fix some more RPM spec file issues. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12073 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES.txt b/CHANGES.txt index d3a258b325..eb812c4d7f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -44,6 +44,8 @@ CHANGES IN CUPS V2.0b1 - Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX) - Dropped lppasswd and support for Digest authentication in in the scheduler (STR #4321) + - The cupsGetClasses, cupsGetPrinters, and cupsTempFile functions are no + longer supported. - The scheduler now caches more job history data and limits the number of completed jobs returned by Get-Jobs as needed in order to prevent a denial-of-service on busy servers (STR #2913) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 45a4779489..181fd58720 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -22,9 +22,9 @@ AC_CONFIG_HEADER(config.h) dnl Version number information... CUPS_VERSION="2.0b1" CUPS_REVISION="" -if test -z "$CUPS_REVISION" -a -d .svn; then - CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" -fi +#if test -z "$CUPS_REVISION" -a -d .svn; then +# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" +#fi CUPS_BUILD="cups-$CUPS_VERSION" AC_ARG_WITH(cups_build, [ --with-cups-build set "cups-config --build" string ], diff --git a/cups/tempfile.c b/cups/tempfile.c index d5703bb2fb..495eeb29c6 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -145,8 +145,8 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ * 'cupsTempFile()' - Generates a temporary filename. * * The temporary filename is returned in the filename buffer. - * This function is deprecated - use @link cupsTempFd@ or - * @link cupsTempFile2@ instead. + * This function is deprecated and will no longer generate a temporary + * filename - use @link cupsTempFd@ or @link cupsTempFile2@ instead. * * @deprecated@ */ @@ -155,38 +155,12 @@ char * /* O - Filename or @code NULL@ on error */ cupsTempFile(char *filename, /* I - Pointer to buffer */ int len) /* I - Size of buffer */ { - int fd; /* File descriptor for temp file */ - _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ - - - /* - * See if a filename was specified... - */ - - if (filename == NULL) - { - filename = cg->tempfile; - len = sizeof(cg->tempfile); - } - - /* - * Create the temporary file... - */ - - if ((fd = cupsTempFd(filename, len)) < 0) - return (NULL); - - /* - * Close the temp file - it'll be reopened later as needed... - */ - - close(fd); + (void)len; - /* - * Return the temp filename... - */ + if (filename) + *filename = '\0'; - return (filename); + return (NULL); } diff --git a/cups/util.c b/cups/util.c index e93601190c..8c340efc79 100644 --- a/cups/util.c +++ b/cups/util.c @@ -288,7 +288,8 @@ cupsFreeJobs(int num_jobs, /* I - Number of jobs */ /* * 'cupsGetClasses()' - Get a list of printer classes from the default server. * - * This function is deprecated - use @link cupsGetDests@ instead. + * This function is deprecated and no longer returns a list of printer + * classes - use @link cupsGetDests@ instead. * * @deprecated@ */ @@ -296,84 +297,10 @@ cupsFreeJobs(int num_jobs, /* I - Number of jobs */ int /* O - Number of classes */ cupsGetClasses(char ***classes) /* O - Classes */ { - int n; /* Number of classes */ - ipp_t *request, /* IPP Request */ - *response; /* IPP Response */ - ipp_attribute_t *attr; /* Current attribute */ - char **temp; /* Temporary pointer */ - http_t *http; /* Connection to server */ - - - if (!classes) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0); - - return (0); - } - - *classes = NULL; - - if ((http = _cupsConnect()) == NULL) - return (0); - - /* - * Build a CUPS_GET_CLASSES request, which requires the following - * attributes: - * - * attributes-charset - * attributes-natural-language - * requested-attributes - */ - - request = ippNewRequest(IPP_OP_CUPS_GET_CLASSES); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", NULL, "printer-name"); - - /* - * Do the request and get back a response... - */ + if (classes) + *classes = NULL; - n = 0; - - if ((response = cupsDoRequest(http, request, "/")) != NULL) - { - for (attr = response->attrs; attr != NULL; attr = attr->next) - if (attr->name != NULL && - _cups_strcasecmp(attr->name, "printer-name") == 0 && - attr->value_tag == IPP_TAG_NAME) - { - if (n == 0) - temp = malloc(sizeof(char *)); - else - temp = realloc(*classes, sizeof(char *) * (size_t)(n + 1)); - - if (temp == NULL) - { - /* - * Ran out of memory! - */ - - while (n > 0) - { - n --; - free((*classes)[n]); - } - - free(*classes); - ippDelete(response); - return (0); - } - - *classes = temp; - temp[n] = strdup(attr->values[0].string.text); - n ++; - } - - ippDelete(response); - } - - return (n); + return (0); } @@ -1146,7 +1073,8 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL /* * 'cupsGetPrinters()' - Get a list of printers from the default server. * - * This function is deprecated - use @link cupsGetDests@ instead. + * This function is deprecated and no longer returns a list of printers - use + * @link cupsGetDests@ instead. * * @deprecated@ */ @@ -1154,98 +1082,10 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL int /* O - Number of printers */ cupsGetPrinters(char ***printers) /* O - Printers */ { - int n; /* Number of printers */ - ipp_t *request, /* IPP Request */ - *response; /* IPP Response */ - ipp_attribute_t *attr; /* Current attribute */ - char **temp; /* Temporary pointer */ - http_t *http; /* Connection to server */ - + if (printers) + *printers = NULL; - /* - * Range check input... - */ - - if (!printers) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0); - - return (0); - } - - *printers = NULL; - - /* - * Try to connect to the server... - */ - - if ((http = _cupsConnect()) == NULL) - return (0); - - /* - * Build a CUPS_GET_PRINTERS request, which requires the following - * attributes: - * - * attributes-charset - * attributes-natural-language - * requested-attributes - */ - - request = ippNewRequest(IPP_OP_CUPS_GET_PRINTERS); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", NULL, "printer-name"); - - ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, - "printer-type", 0); - - ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, - "printer-type-mask", CUPS_PRINTER_CLASS); - - /* - * Do the request and get back a response... - */ - - n = 0; - - if ((response = cupsDoRequest(http, request, "/")) != NULL) - { - for (attr = response->attrs; attr != NULL; attr = attr->next) - if (attr->name != NULL && - _cups_strcasecmp(attr->name, "printer-name") == 0 && - attr->value_tag == IPP_TAG_NAME) - { - if (n == 0) - temp = malloc(sizeof(char *)); - else - temp = realloc(*printers, sizeof(char *) * (size_t)(n + 1)); - - if (temp == NULL) - { - /* - * Ran out of memory! - */ - - while (n > 0) - { - n --; - free((*printers)[n]); - } - - free(*printers); - ippDelete(response); - return (0); - } - - *printers = temp; - temp[n] = strdup(attr->values[0].string.text); - n ++; - } - - ippDelete(response); - } - - return (n); + return (0); } diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 6bd01d94e0..220c0f1cb0 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-cgi.html b/doc/help/api-cgi.html index 57087c5f57..63eb9ca6d0 100644 --- a/doc/help/api-cgi.html +++ b/doc/help/api-cgi.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index cdd11fdfa1..dd9a4fb12d 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; @@ -436,6 +448,7 @@ specific size.">cupsGetDestMediaByIndex
  • cupsGetDestMediaCount
  • cupsGetDestMediaDefault
    • +
  • cupsGetDestWithURI
  • cupsGetDests
  • cupsGetDests2
  • cupsGetJobs
    • @@ -457,6 +470,8 @@ for the given language.">cupsLangEncoding
  • cupsLangFlush
  • cupsLangFree
  • cupsLangGet
    • +
  • cupsLocalizeDestMedia
  • cupsLocalizeDestOption
  • Return Value

    Number of classes

    Discussion

    -

    This function is deprecated - use cupsGetDests instead. +

    This function is deprecated and no longer returns a list of printer +classes - use cupsGetDests instead.

    cupsGetDefault

    @@ -2080,6 +2096,29 @@ int cupsGetDestMediaDefault (
    example, passing CUPS_MEDIA_FLAGS_BORDERLESS will return the default borderless size, typically US Letter or A4, but sometimes 4x6 photo media. +

    +

     CUPS 2.0 cupsGetDestWithURI

    +

    Get a destination associated with a URI.

    +

    +cups_dest_t *cupsGetDestWithURI (
    +    const char *name,
    +    const char *uri
    +);

    +

    Parameters

    +
    +
    name
    +
    Desired printer name or NULL
    +
    uri
    +
    URI for the printer
    +
    +

    Return Value

    +

    Destination or NULL

    +

    Discussion

    +

    "name" is the desired name for the printer. If NULL, a name will be +created using the URI.
    +
    +"uri" is the "ipp" or "ipps" URI for the printer. +

    cupsGetDests

    Get the list of destinations from the default server.

    @@ -2405,7 +2444,8 @@ int cupsGetPrinters (

    Return Value

    Number of printers

    Discussion

    -

    This function is deprecated - use cupsGetDests instead. +

    This function is deprecated and no longer returns a list of printers - use +cupsGetDests instead.

     CUPS 1.3/OS X 10.5 cupsGetServerPPD

    @@ -2485,6 +2525,37 @@ cups_lang_t *cupsLangGet (

    Return Value

    Language data

    +

     CUPS 2.0 cupsLocalizeDestMedia

    +

    Get the localized string for a destination media +size.

    +

    +const char *cupsLocalizeDestMedia (
    +    http_t *http,
    +    cups_dest_t *dest,
    +    cups_dinfo_t *dinfo,
    +    unsigned flags,
    +    cups_size_t *size
    +);

    +

    Parameters

    +
    +
    http
    +
    Connection to destination
    +
    dest
    +
    Destination
    +
    dinfo
    +
    Destination information
    +
    flags
    +
    Media flags
    +
    size
    +
    Media size
    +
    +

    Return Value

    +

    Localized string

    +

    Discussion

    +

    The returned string is stored in the destination information and will become +invalid if the destination information is deleted. + +

     CUPS 1.6/OS X 10.8 cupsLocalizeDestOption

    Get the localized string for a destination option.

    @@ -3156,8 +3227,8 @@ char *cupsTempFile (

    Filename or NULL on error

    Discussion

    The temporary filename is returned in the filename buffer. -This function is deprecated - use cupsTempFd or -cupsTempFile2 instead. +This function is deprecated and will no longer generate a temporary +filename - use cupsTempFd or cupsTempFile2 instead.

     CUPS 1.2/OS X 10.5 cupsTempFile2

    diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index f07524af7d..309d09daae 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index db774c4c0f..416e2fbab4 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index 5f4f2f38cb..083794489d 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; @@ -642,6 +654,7 @@ with a hostname. ">http_addrlist_t
    • are server-oriented...">http_state_t
  • http_t
  • http_timeout_cb_t
    • +
  • http_trust_t
  • http_uri_coding_t
  • http_uri_status_t
  • http_version_t
    • @@ -679,6 +692,7 @@ with a hostname. ">http_addrlist_s
  • http_state_e
  • http_status_e
    • +
  • http_trust_e
  • http_uri_coding_e
  • http_uri_status_e
  • http_version_e
    • @@ -4313,6 +4327,10 @@ ipp_status_t ippErrorValue (

    Return Value

    Matching attribute

    +

    Discussion

    +

    Starting with CUPS 2.0, the attribute name can contain a hierarchical list +of attribute and member names separated by slashes, for example +"media-col/media-size".

    ippFindNextAttribute

    Find the next named attribute in a request.

    @@ -4332,6 +4350,10 @@ ipp_status_t ippErrorValue (

    Return Value

    Matching attribute

    +

    Discussion

    +

    Starting with CUPS 2.0, the attribute name can contain a hierarchical list +of attribute and member names separated by slashes, for example +"media-col/media-size".

     CUPS 1.6/OS X 10.8 ippFirstAttribute

    Return the first attribute in the message.

    @@ -4360,7 +4382,7 @@ int ippGetBoolean (

    Value number (0-based)

    Return Value

    -

    Boolean value or -1 on error

    +

    Boolean value or 0 on error

    Discussion

    The element parameter specifies which value to get from 0 to ippGetCount(attr) - 1. @@ -4399,7 +4421,7 @@ int ippGetCount (

    IPP attribute

    Return Value

    -

    Number of values or -1 on error

    +

    Number of values or 0 on error

     CUPS 1.6/OS X 10.8 ippGetDate

    Get a date value for an attribute.

    @@ -4449,7 +4471,7 @@ int ippGetInteger (

    Value number (0-based)

    Return Value

    -

    Value or -1 on error

    +

    Value or 0 on error

    Discussion

    The element parameter specifies which value to get from 0 to ippGetCount(attr) - 1. @@ -4504,7 +4526,7 @@ ipp_op_t ippGetOperation (

    IPP request message

    Return Value

    -

    Operation ID or -1 on error

    +

    Operation ID or 0 on error

     CUPS 1.6/OS X 10.8 ippGetRange

    Get a rangeOfInteger value from an attribute.

    @@ -4523,7 +4545,7 @@ int ippGetRange (

    Upper value of range

    Return Value

    -

    Lower value of range or -1

    +

    Lower value of range or 0

    Discussion

    The element parameter specifies which value to get from 0 to ippGetCount(attr) - 1. @@ -4541,7 +4563,7 @@ int ippGetRequestId (

    IPP message

    Return Value

    -

    Request ID or -1 on error

    +

    Request ID or 0 on error

     CUPS 1.6/OS X 10.8 ippGetResolution

    Get a resolution value for an attribute.

    @@ -4563,7 +4585,7 @@ int ippGetResolution (

    Units for resolution

    Return Value

    -

    Horizontal/cross feed resolution or -1

    +

    Horizontal/cross feed resolution or 0

    Discussion

    The element parameter specifies which value to get from 0 to ippGetCount(attr) - 1. @@ -4646,7 +4668,7 @@ int ippGetVersion (

    Minor version number or NULL

    Return Value

    -

    Major version number or -1 on error

    +

    Major version number or 0 on error

    ippLength

    Compute the length of an IPP message.

    @@ -5594,6 +5616,11 @@ typedef struct _http_s http_t;

    typedef int (*http_timeout_cb_t)(http_t *http, void *user_data);

    +

     CUPS 2.0 http_trust_t

    +

    Level of trust for credentials

    +

    +typedef enum http_trust_e http_trust_t; +

    http_uri_coding_t

    URI en/decode flags

    @@ -5991,6 +6018,23 @@ are server-oriented...

    HTTP_STATUS_USE_PROXY
    Must use a proxy to access this URI
    +

     CUPS 2.0 http_trust_e

    +

    Level of trust for credentials

    +

    Constants

    +
    +
    HTTP_TRUST_CHANGED
    +
    Credentials have changed
    +
    HTTP_TRUST_EXPIRED
    +
    Credentials are expired
    +
    HTTP_TRUST_INVALID
    +
    Credentials are invalid
    +
    HTTP_TRUST_OK
    +
    Credentials are OK/trusted
    +
    HTTP_TRUST_RENEWED
    +
    Credentials have been renewed
    +
    HTTP_TRUST_UNKNOWN
    +
    Credentials are unknown/new
    +

    http_uri_coding_e

    URI en/decode flags

    Constants

    @@ -6449,6 +6493,14 @@ are server-oriented...

    Invalid status name for ippErrorValue
    IPP_STATUS_CUPS_SEE_OTHER
    cups-see-other
    +
    IPP_STATUS_ERROR_ACCOUNT_AUTHORIZATION_FAILED
    +
    client-error-account-authorization-failed
    +
    IPP_STATUS_ERROR_ACCOUNT_CLOSED
    +
    client-error-account-closed
    +
    IPP_STATUS_ERROR_ACCOUNT_INFO_NEEDED
    +
    client-error-account-info-needed
    +
    IPP_STATUS_ERROR_ACCOUNT_LIMIT_REACHED
    +
    client-error-account-limit-reached
    IPP_STATUS_ERROR_ATTRIBUTES_NOT_SETTABLE
    client-error-attributes-not-settable
    IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES
    @@ -6465,13 +6517,13 @@ are server-oriented...

    client-error-compression-not-supported
    IPP_STATUS_ERROR_CONFLICTING
    client-error-conflicting-attributes
    -
    IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED  CUPS 1.7/OS X 10.9 
    +
    IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED  DEPRECATED 
    cups-error-account-authorization-failed
    -
    IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED  CUPS 1.7/OS X 10.9 
    -
    cups-error-account-closed
    -
    IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED  CUPS 1.7/OS X 10.9 
    +
    IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED
    +
    cups-error-account-closed @deprecate@
    +
    IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED  DEPRECATED 
    cups-error-account-info-needed
    -
    IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED  CUPS 1.7/OS X 10.9 
    +
    IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED  DEPRECATED 
    cups-error-account-limit-reached
    IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED  CUPS 1.5/OS X 10.7 
    cups-authentication-canceled - Authentication canceled by user
    diff --git a/doc/help/api-mime.html b/doc/help/api-mime.html index dab2365fd9..d957342995 100644 --- a/doc/help/api-mime.html +++ b/doc/help/api-mime.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-overview.html b/doc/help/api-overview.html index 95c64e29a8..01a041493c 100644 --- a/doc/help/api-overview.html +++ b/doc/help/api-overview.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index 47c10386c3..5121b65944 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-ppdc.html b/doc/help/api-ppdc.html index 63285b48ea..df32135754 100644 --- a/doc/help/api-ppdc.html +++ b/doc/help/api-ppdc.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 859dde4212..9acda474fd 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index c3c99f8cb2..c627824a71 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -96,6 +96,14 @@ The default is "Yes".
    Specifies the delay for updating of configuration and state files. A value of 0 causes the update to happen as soon as possible, typically within a few milliseconds. The default value is "30". +
    ErrorPolicy abort-job +
    Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer. +
    ErrorPolicy retry-job +
    Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. +
    ErrorPolicy retry-this-job +
    Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. +
    ErrorPolicy stop-printer +
    Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
    FilterLimit limit
    Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems. A limit of 0 disables filter limiting. @@ -284,7 +292,7 @@ command. "Major" reports "CUPS 2". "Minor" reports "CUPS 2.0". "Minimal" reports "CUPS 2.0.0". -"OS" reports "CUPS 2.0.0 (UNAME)" where UNAME is the output of the +"OS" reports "CUPS 2.0.0 (UNAME)" where UNAME is the output of the uname(1) command. "Full" reports "CUPS 2.0.0 (UNAME) IPP/2.0". diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html index 0a3314b761..1469f45e51 100644 --- a/doc/help/postscript-driver.html +++ b/doc/help/postscript-driver.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html index 2ef33fd28e..729e26851e 100644 --- a/doc/help/ppd-compiler.html +++ b/doc/help/ppd-compiler.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html index 40fc01d3e1..8055705f4f 100644 --- a/doc/help/raster-driver.html +++ b/doc/help/raster-driver.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index 894e0bf44a..4cdb4721a6 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -39,6 +39,18 @@ P.example { margin-left: 36pt; } +DL.man DD { + margin-left: 5em; +} + +DL.man DT { + margin-left: 0; +} + +PRE.man { + margin: 0; +} + PRE.example { background: #eeeeee; border: dotted thin #999999; diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 27d24c554e..5860951f10 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -294,6 +294,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/man/man1 /usr/share/man/man1/cancel.1.gz +/usr/share/man/man1/cups.1.gz /usr/share/man/man1/cupstestdsc.1.gz /usr/share/man/man1/cupstestppd.1.gz /usr/share/man/man1/ippfind.1.gz @@ -315,11 +316,12 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man8/cupsctl.8.gz /usr/share/man/man8/cupsfilter.8.gz /usr/share/man/man8/cupsd.8.gz +/usr/share/man/man8/cupsd-helper.8.gz +/usr/share/man/man8/cupsd-logs.8.gz /usr/share/man/man8/cupsdisable.8.gz /usr/share/man/man8/cupsenable.8.gz /usr/share/man/man8/cupsreject.8.gz -/usr/share/man/man8/cups-deviced.8.gz -/usr/share/man/man8/cups-driverd.8.gz +/usr/share/man/man8/cups-exec.8.gz /usr/share/man/man8/cups-snmp.8.gz /usr/share/man/man8/lpadmin.8.gz /usr/share/man/man8/lpc.8.gz