Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/cups/patches/22-16362516,16321334,15731683.patch
author Edwin Beasant <Edwin.Beasant@oracle.com>
Thu, 13 Jun 2013 20:08:09 +0100
branchs11-update
changeset 2648 282079e8bab1
parent 2621 f16db03950b1
permissions -rw-r--r--
16914633 mlocate package doesn't deliver quite what it promised to PSARC.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2621
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     1
 
--- scheduler/ipp.c	Thu Mar 28 22:47:57 2013
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     2
 
+++ scheduler/ipp.c	Tue Apr  9 00:31:58 2013
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     3
 
@@ -7424,8 +7424,12 @@
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     4
 
       continue;
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     5
 
     }
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     6
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     7
 
-    if (username[0] && strcasecmp(username, job->username))
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     8
 
-      continue;
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
     9
 
+    /*
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    10
 
+     * If no username is given, then it might be set to 'anonymous'.
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    11
 
+     * In this case we don't compare with job->username.
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    12
 
+     */
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    13
 
+    if (username[0] && strcasecmp(username, "anonymous") && strcasecmp(username, job->username))
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    14
 
+	continue;
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    15
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    16
 
     if (count > 0)
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    17
 
       ippAddSeparator(con->response);
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    18
 
@@ -8780,7 +8784,7 @@
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    19
 
    * Validate that the label associated with the job is acceptable for
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    20
 
    * printing on the printer.
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    21
 
    */
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    22
 
-  if (cupsdInPrinterLabelRange(job->slabel, dprinter) == 0)
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    23
 
+  if (job && (cupsdInPrinterLabelRange(job->slabel, dprinter) == 0))
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    24
 
   {
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    25
 
     send_ipp_status(con, IPP_NOT_AUTHORIZED, _("label violation."));
f16db03950b1 16362516 lpstat and lpq commands report bad value
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff changeset 
    26
 
     return;
upstream/oracle/userland-gate