diff options
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | config-scripts/cups-common.m4 | 6 | ||||
| -rw-r--r-- | cups/tempfile.c | 38 | ||||
| -rw-r--r-- | cups/util.c | 180 | ||||
| -rw-r--r-- | doc/help/api-array.html | 12 | ||||
| -rw-r--r-- | doc/help/api-cgi.html | 12 | ||||
| -rw-r--r-- | doc/help/api-cups.html | 79 | ||||
| -rw-r--r-- | doc/help/api-filedir.html | 12 | ||||
| -rw-r--r-- | doc/help/api-filter.html | 12 | ||||
| -rw-r--r-- | doc/help/api-httpipp.html | 78 | ||||
| -rw-r--r-- | doc/help/api-mime.html | 12 | ||||
| -rw-r--r-- | doc/help/api-overview.html | 12 | ||||
| -rw-r--r-- | doc/help/api-ppd.html | 12 | ||||
| -rw-r--r-- | doc/help/api-ppdc.html | 12 | ||||
| -rw-r--r-- | doc/help/api-raster.html | 12 | ||||
| -rw-r--r-- | doc/help/man-cupsd.conf.html | 10 | ||||
| -rw-r--r-- | doc/help/postscript-driver.html | 12 | ||||
| -rw-r--r-- | doc/help/ppd-compiler.html | 12 | ||||
| -rw-r--r-- | doc/help/raster-driver.html | 12 | ||||
| -rw-r--r-- | doc/help/spec-ppd.html | 12 | ||||
| -rw-r--r-- | packaging/cups.spec.in | 6 |
21 files changed, 330 insertions, 225 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index d3a258b32..eb812c4d7 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 45a477948..181fd5872 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 d5703bb2f..495eeb29c 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 e93601190..8c340efc7 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 6bd01d94e..220c0f1cb 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 57087c5f5..63eb9ca6d 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 cdd11fdfa..dd9a4fb12 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</a></li> <li><a href="#cupsGetDestMediaCount" title="Get the number of sizes supported by a destination.">cupsGetDestMediaCount</a></li> <li><a href="#cupsGetDestMediaDefault" title="Get the default size for a destination.">cupsGetDestMediaDefault</a></li> + <li><a href="#cupsGetDestWithURI" title="Get a destination associated with a URI.">cupsGetDestWithURI</a></li> <li><a href="#cupsGetDests" title="Get the list of destinations from the default server.">cupsGetDests</a></li> <li><a href="#cupsGetDests2" title="Get the list of destinations from the specified server.">cupsGetDests2</a></li> <li><a href="#cupsGetJobs" title="Get the jobs from the default server.">cupsGetJobs</a></li> @@ -457,6 +470,8 @@ for the given language.">cupsLangEncoding</a></li> <li><a href="#cupsLangFlush" title="Flush all language data out of the cache.">cupsLangFlush</a></li> <li><a href="#cupsLangFree" title="Free language data.">cupsLangFree</a></li> <li><a href="#cupsLangGet" title="Get a language.">cupsLangGet</a></li> + <li><a href="#cupsLocalizeDestMedia" title="Get the localized string for a destination media +size.">cupsLocalizeDestMedia</a></li> <li><a href="#cupsLocalizeDestOption" title="Get the localized string for a destination option.">cupsLocalizeDestOption</a></li> <li><a href="#cupsLocalizeDestValue" title="Get the localized string for a destination @@ -1830,7 +1845,8 @@ int cupsGetClasses (<br> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of classes</p> <h4 class="discussion">Discussion</h4> -<p class="discussion">This function is deprecated - use <a href="#cupsGetDests"><code>cupsGetDests</code></a> instead. +<p class="discussion">This function is deprecated and no longer returns a list of printer +classes - use <a href="#cupsGetDests"><code>cupsGetDests</code></a> instead. </p> <h3 class="function"><a name="cupsGetDefault">cupsGetDefault</a></h3> @@ -2081,6 +2097,29 @@ example, passing <code>CUPS_MEDIA_FLAGS_BORDERLESS</code> will return the defaul borderless size, typically US Letter or A4, but sometimes 4x6 photo media. </p> +<h3 class="function"><span class="info"> CUPS 2.0 </span><a name="cupsGetDestWithURI">cupsGetDestWithURI</a></h3> +<p class="description">Get a destination associated with a URI.</p> +<p class="code"> +<a href="#cups_dest_t">cups_dest_t</a> *cupsGetDestWithURI (<br> + const char *name,<br> + const char *uri<br> +);</p> +<h4 class="parameters">Parameters</h4> +<dl> +<dt>name</dt> +<dd class="description">Desired printer name or <code>NULL</code></dd> +<dt>uri</dt> +<dd class="description">URI for the printer</dd> +</dl> +<h4 class="returnvalue">Return Value</h4> +<p class="description">Destination or <code>NULL</code></p> +<h4 class="discussion">Discussion</h4> +<p class="discussion">"name" is the desired name for the printer. If <code>NULL</code>, a name will be +created using the URI.<br> +<br> +"uri" is the "ipp" or "ipps" URI for the printer. + +</p> <h3 class="function"><a name="cupsGetDests">cupsGetDests</a></h3> <p class="description">Get the list of destinations from the default server.</p> <p class="code"> @@ -2405,7 +2444,8 @@ int cupsGetPrinters (<br> <h4 class="returnvalue">Return Value</h4> <p class="description">Number of printers</p> <h4 class="discussion">Discussion</h4> -<p class="discussion">This function is deprecated - use <a href="#cupsGetDests"><code>cupsGetDests</code></a> instead. +<p class="discussion">This function is deprecated and no longer returns a list of printers - use +<a href="#cupsGetDests"><code>cupsGetDests</code></a> instead. </p> <h3 class="function"><span class="info"> CUPS 1.3/OS X 10.5 </span><a name="cupsGetServerPPD">cupsGetServerPPD</a></h3> @@ -2485,6 +2525,37 @@ cups_lang_t *cupsLangGet (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Language data</p> +<h3 class="function"><span class="info"> CUPS 2.0 </span><a name="cupsLocalizeDestMedia">cupsLocalizeDestMedia</a></h3> +<p class="description">Get the localized string for a destination media +size.</p> +<p class="code"> +const char *cupsLocalizeDestMedia (<br> + http_t *http,<br> + <a href="#cups_dest_t">cups_dest_t</a> *dest,<br> + <a href="#cups_dinfo_t">cups_dinfo_t</a> *dinfo,<br> + unsigned flags,<br> + <a href="#cups_size_t">cups_size_t</a> *size<br> +);</p> +<h4 class="parameters">Parameters</h4> +<dl> +<dt>http</dt> +<dd class="description">Connection to destination</dd> +<dt>dest</dt> +<dd class="description">Destination</dd> +<dt>dinfo</dt> +<dd class="description">Destination information</dd> +<dt>flags</dt> +<dd class="description">Media flags</dd> +<dt>size</dt> +<dd class="description">Media size</dd> +</dl> +<h4 class="returnvalue">Return Value</h4> +<p class="description">Localized string</p> +<h4 class="discussion">Discussion</h4> +<p class="discussion">The returned string is stored in the destination information and will become +invalid if the destination information is deleted. + +</p> <h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="cupsLocalizeDestOption">cupsLocalizeDestOption</a></h3> <p class="description">Get the localized string for a destination option.</p> @@ -3156,8 +3227,8 @@ char *cupsTempFile (<br> <p class="description">Filename or <code>NULL</code> on error</p> <h4 class="discussion">Discussion</h4> <p class="discussion">The temporary filename is returned in the filename buffer. -This function is deprecated - use <a href="#cupsTempFd"><code>cupsTempFd</code></a> or -<a href="#cupsTempFile2"><code>cupsTempFile2</code></a> instead. +This function is deprecated and will no longer generate a temporary +filename - use <a href="#cupsTempFd"><code>cupsTempFd</code></a> or <a href="#cupsTempFile2"><code>cupsTempFile2</code></a> instead. </p> <h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsTempFile2">cupsTempFile2</a></h3> diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index f07524af7..309d09daa 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 db774c4c0..416e2fbab 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 5f4f2f38c..083794489 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</a></li> are server-oriented...">http_state_t</a></li> <li><a href="#http_t" title="HTTP connection type">http_t</a></li> <li><a href="#http_timeout_cb_t" title="HTTP timeout callback ">http_timeout_cb_t</a></li> + <li><a href="#http_trust_t" title="Level of trust for credentials ">http_trust_t</a></li> <li><a href="#http_uri_coding_t" title="URI en/decode flags">http_uri_coding_t</a></li> <li><a href="#http_uri_status_t" title="URI separation status ">http_uri_status_t</a></li> <li><a href="#http_version_t" title="HTTP version numbers">http_version_t</a></li> @@ -679,6 +692,7 @@ with a hostname. ">http_addrlist_s</a></li> <li><a href="#http_state_e" title="HTTP state values; states are server-oriented...">http_state_e</a></li> <li><a href="#http_status_e" title="HTTP status codes">http_status_e</a></li> + <li><a href="#http_trust_e" title="Level of trust for credentials ">http_trust_e</a></li> <li><a href="#http_uri_coding_e" title="URI en/decode flags">http_uri_coding_e</a></li> <li><a href="#http_uri_status_e" title="URI separation status ">http_uri_status_e</a></li> <li><a href="#http_version_e" title="HTTP version numbers">http_version_e</a></li> @@ -4313,6 +4327,10 @@ ipp_status_t ippErrorValue (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Matching attribute</p> +<h4 class="discussion">Discussion</h4> +<p class="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".</p> <h3 class="function"><a name="ippFindNextAttribute">ippFindNextAttribute</a></h3> <p class="description">Find the next named attribute in a request.</p> <p class="code"> @@ -4332,6 +4350,10 @@ ipp_status_t ippErrorValue (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">Matching attribute</p> +<h4 class="discussion">Discussion</h4> +<p class="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".</p> <h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippFirstAttribute">ippFirstAttribute</a></h3> <p class="description">Return the first attribute in the message.</p> <p class="code"> @@ -4360,7 +4382,7 @@ int ippGetBoolean (<br> <dd class="description">Value number (0-based)</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Boolean value or -1 on error</p> +<p class="description">Boolean value or 0 on error</p> <h4 class="discussion">Discussion</h4> <p class="discussion">The <code>element</code> parameter specifies which value to get from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. @@ -4399,7 +4421,7 @@ int ippGetCount (<br> <dd class="description">IPP attribute</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Number of values or -1 on error</p> +<p class="description">Number of values or 0 on error</p> <h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetDate">ippGetDate</a></h3> <p class="description">Get a date value for an attribute.</p> <p class="code"> @@ -4449,7 +4471,7 @@ int ippGetInteger (<br> <dd class="description">Value number (0-based)</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Value or -1 on error</p> +<p class="description">Value or 0 on error</p> <h4 class="discussion">Discussion</h4> <p class="discussion">The <code>element</code> parameter specifies which value to get from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. @@ -4504,7 +4526,7 @@ ipp_op_t ippGetOperation (<br> <dd class="description">IPP request message</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Operation ID or -1 on error</p> +<p class="description">Operation ID or 0 on error</p> <h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetRange">ippGetRange</a></h3> <p class="description">Get a rangeOfInteger value from an attribute.</p> <p class="code"> @@ -4523,7 +4545,7 @@ int ippGetRange (<br> <dd class="description">Upper value of range</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Lower value of range or -1</p> +<p class="description">Lower value of range or 0</p> <h4 class="discussion">Discussion</h4> <p class="discussion">The <code>element</code> parameter specifies which value to get from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. @@ -4541,7 +4563,7 @@ int ippGetRequestId (<br> <dd class="description">IPP message</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Request ID or -1 on error</p> +<p class="description">Request ID or 0 on error</p> <h3 class="function"><span class="info"> CUPS 1.6/OS X 10.8 </span><a name="ippGetResolution">ippGetResolution</a></h3> <p class="description">Get a resolution value for an attribute.</p> <p class="code"> @@ -4563,7 +4585,7 @@ int ippGetResolution (<br> <dd class="description">Units for resolution</dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Horizontal/cross feed resolution or -1</p> +<p class="description">Horizontal/cross feed resolution or 0</p> <h4 class="discussion">Discussion</h4> <p class="discussion">The <code>element</code> parameter specifies which value to get from 0 to <a href="#ippGetCount(attr)"><code>ippGetCount(attr)</code></a> - 1. @@ -4646,7 +4668,7 @@ int ippGetVersion (<br> <dd class="description">Minor version number or <code>NULL</code></dd> </dl> <h4 class="returnvalue">Return Value</h4> -<p class="description">Major version number or -1 on error</p> +<p class="description">Major version number or 0 on error</p> <h3 class="function"><a name="ippLength">ippLength</a></h3> <p class="description">Compute the length of an IPP message.</p> <p class="code"> @@ -5594,6 +5616,11 @@ typedef struct _http_s http_t; <p class="code"> typedef int (*http_timeout_cb_t)(<a href="#http_t">http_t</a> *http, void *user_data); </p> +<h3 class="typedef"><span class="info"> CUPS 2.0 </span><a name="http_trust_t">http_trust_t</a></h3> +<p class="description">Level of trust for credentials </p> +<p class="code"> +typedef enum <a href="#http_trust_e">http_trust_e</a> http_trust_t; +</p> <h3 class="typedef"><a name="http_uri_coding_t">http_uri_coding_t</a></h3> <p class="description">URI en/decode flags</p> <p class="code"> @@ -5991,6 +6018,23 @@ are server-oriented...</p> <dt>HTTP_STATUS_USE_PROXY </dt> <dd class="description">Must use a proxy to access this URI</dd> </dl> +<h3 class="enumeration"><span class="info"> CUPS 2.0 </span><a name="http_trust_e">http_trust_e</a></h3> +<p class="description">Level of trust for credentials </p> +<h4 class="constants">Constants</h4> +<dl> +<dt>HTTP_TRUST_CHANGED </dt> +<dd class="description">Credentials have changed</dd> +<dt>HTTP_TRUST_EXPIRED </dt> +<dd class="description">Credentials are expired</dd> +<dt>HTTP_TRUST_INVALID </dt> +<dd class="description">Credentials are invalid</dd> +<dt>HTTP_TRUST_OK </dt> +<dd class="description">Credentials are OK/trusted</dd> +<dt>HTTP_TRUST_RENEWED </dt> +<dd class="description">Credentials have been renewed</dd> +<dt>HTTP_TRUST_UNKNOWN </dt> +<dd class="description">Credentials are unknown/new</dd> +</dl> <h3 class="enumeration"><a name="http_uri_coding_e">http_uri_coding_e</a></h3> <p class="description">URI en/decode flags</p> <h4 class="constants">Constants</h4> @@ -6449,6 +6493,14 @@ are server-oriented...</p> <dd class="description">Invalid status name for <a href="#ippErrorValue"><code>ippErrorValue</code></a></dd> <dt>IPP_STATUS_CUPS_SEE_OTHER </dt> <dd class="description">cups-see-other</dd> +<dt>IPP_STATUS_ERROR_ACCOUNT_AUTHORIZATION_FAILED </dt> +<dd class="description">client-error-account-authorization-failed</dd> +<dt>IPP_STATUS_ERROR_ACCOUNT_CLOSED </dt> +<dd class="description">client-error-account-closed</dd> +<dt>IPP_STATUS_ERROR_ACCOUNT_INFO_NEEDED </dt> +<dd class="description">client-error-account-info-needed</dd> +<dt>IPP_STATUS_ERROR_ACCOUNT_LIMIT_REACHED </dt> +<dd class="description">client-error-account-limit-reached</dd> <dt>IPP_STATUS_ERROR_ATTRIBUTES_NOT_SETTABLE </dt> <dd class="description">client-error-attributes-not-settable</dd> <dt>IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES </dt> @@ -6465,13 +6517,13 @@ are server-oriented...</p> <dd class="description">client-error-compression-not-supported</dd> <dt>IPP_STATUS_ERROR_CONFLICTING </dt> <dd class="description">client-error-conflicting-attributes</dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED <span class="info"> DEPRECATED </span></dt> <dd class="description">cups-error-account-authorization-failed </dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> -<dd class="description">cups-error-account-closed </dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED </dt> +<dd class="description">cups-error-account-closed @deprecate@</dd> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED <span class="info"> DEPRECATED </span></dt> <dd class="description">cups-error-account-info-needed </dd> -<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED <span class="info"> CUPS 1.7/OS X 10.9 </span></dt> +<dt>IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED <span class="info"> DEPRECATED </span></dt> <dd class="description">cups-error-account-limit-reached </dd> <dt>IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED <span class="info"> CUPS 1.5/OS X 10.7 </span></dt> <dd class="description">cups-authentication-canceled - Authentication canceled by user </dd> diff --git a/doc/help/api-mime.html b/doc/help/api-mime.html index dab2365fd..d95734299 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 95c64e29a..01a041493 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 47c10386c..5121b6594 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 63285b48e..df3213575 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 859dde421..9acda474f 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 c3c99f8cb..c627824a7 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -96,6 +96,14 @@ The default is "Yes". <dd style="margin-left: 5.0em">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". +<dt><b>ErrorPolicy abort-job</b> +<dd style="margin-left: 5.0em">Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer. +<dt><b>ErrorPolicy retry-job</b> +<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. +<dt><b>ErrorPolicy retry-this-job</b> +<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. +<dt><b>ErrorPolicy stop-printer</b> +<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default. <dt><b>FilterLimit </b><i>limit</i> <dd style="margin-left: 5.0em">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 <b>uname</b>(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 0a3314b76..1469f45e5 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 2ef33fd28..729e26851 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 40fc01d3e..8055705f4 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 894e0bf44..4cdb4721a 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 27d24c554..5860951f1 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 |