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

diff --git a/CHANGES.txt b/CHANGES.txt
index ea10cc7721455807816c52957c903ced19d58e26..5047b1cea05e46d32323e8c58ce54b4e4d69a486 100644 (file)
--- 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 cecbba41831d5700b385d658291ccbba8b7bc120..5589c1155e30ab9952f3aaadc771a6d25fb3642c 100644 (file)
--- 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 d954e75fb8e1935f5d5b262ca12148ad86cc7925..a0ed62c6cf9b45c31d9b1c4c877d6b642471d2e6 100644 (file)
--- 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)