Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@2129 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 8917783efe8ef16e20a8af9464cfa0dc8c1d2943..2548ad72c65a4aea4e9563ec9e75c5477653005f 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -1,6 +1,15 @@
 CHANGES-1.1.txt
 ---------------
 
+CHANGES IN CUPS V1.1.14
+
+       - The IPP backend did not pass the requesting user name
+         when checking on the print job status. This prevented
+         it from waiting for the job to complete when
+         communicating with some IPP implementations that
+         require it.
+
+
 CHANGES IN CUPS V1.1.13
 
        - The lpstat command did not report jobs submitted to

diff --git a/backend/ipp.c b/backend/ipp.c
index 9a851590a4635a0c899e9fb4a5568720fba39d84..764db54722142c79ca40516602522427b94bf1c6 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.38.2.6 2002/01/30 18:31:23 mike Exp $"
+ * "$Id: ipp.c,v 1.38.2.7 2002/02/06 19:21:42 mike Exp $"
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
@@ -556,6 +556,10 @@ main(int  argc,            /* I - Number of command-line arguments (6 or 7) */
       ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
                    job_id);
 
+      if (argv[2][0])
+       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+                    NULL, argv[2]);
+
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                    "requested-attributes", NULL, "job-state");
 
@@ -630,8 +634,12 @@ main(int  argc,            /* I - Number of command-line arguments (6 or 7) */
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                   NULL, uri);
 
+      if (argv[2][0])
+       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+                    NULL, argv[2]);
+
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                   "requested-attributes", NULL, "job-state-reasons");
+                   "requested-attributes", NULL, "printer-state-reasons");
 
      /*
       * Do the request...
@@ -789,5 +797,5 @@ report_printer_state(ipp_t *ipp)    /* I - IPP response */
 
 
 /*
- * End of "$Id: ipp.c,v 1.38.2.6 2002/01/30 18:31:23 mike Exp $".
+ * End of "$Id: ipp.c,v 1.38.2.7 2002/02/06 19:21:42 mike Exp $".
  */