diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-10-18 21:14:52 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-10-18 21:14:52 +0000 |
| commit | e9152ac713aebcb1b00f1fe912f410e1ab1cff7c (patch) | |
| tree | b1a094c1a7e97d4df70cbe747c7b6b6edf75f030 | |
| parent | 3d3f64a9824af05e6909c4f861800e922476b108 (diff) | |
| download | cups-e9152ac713aebcb1b00f1fe912f410e1ab1cff7c.tar.gz | |
Mirror fix from trunk.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11345 a1ca3aef-8c08-0410-bb20-df032aa958be
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | cgi-bin/admin.c | 14 | ||||
| -rw-r--r-- | systemv/lpadmin.c | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ea10cc772..5047b1cea 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,9 +1,11 @@ -CHANGES.txt - 1.7.0 - 2013-09-27 +CHANGES.txt - 1.7.0 - 2013-10-18 -------------------------------- CHANGES IN CUPS V1.7.0 - Updated Japanese localization. + - The lpadmin command did not send the PPD name from the "-m" option + (<rdar://problem/15264697>) - Network backends now use the prtMarkerSuppliesClass property to determine the direction of supply level values (<rdar://problem/14302628>) diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index cecbba418..5589c1155 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1348,20 +1348,20 @@ do_am_printer(http_t *http, /* I - HTTP connection */ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); - ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location", - NULL, cgiGetVariable("PRINTER_LOCATION")); - - ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info", - NULL, cgiGetVariable("PRINTER_INFO")); - if (!file) { var = cgiGetVariable("PPD_NAME"); if (strcmp(var, "__no_change__")) - ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name", + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "ppd-name", NULL, var); } + ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location", + NULL, cgiGetVariable("PRINTER_LOCATION")); + + ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info", + NULL, cgiGetVariable("PRINTER_INFO")); + strlcpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri)); /* diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index d954e75fb..a0ed62c6c 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1295,6 +1295,7 @@ set_printer_options( * Add the options... */ + cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION); cupsEncodeOptions2(request, num_options, options, IPP_TAG_PRINTER); if ((protocol = cupsGetOption("protocol", num_options, options)) != NULL) |